build: trial version target

builds now app and trail target, lib_gui added, istrail function
This commit is contained in:
Andreas Stallinger
2015-12-08 17:55:12 +01:00
parent ed4b6546f0
commit 43409cd6b7
154 changed files with 444 additions and 213 deletions
+138 -50
View File
@@ -16,6 +16,8 @@ include(cmake/licenses.cmake)
set(PROJECT_NAME Coati)
set(APP_PROJECT_NAME "${PROJECT_NAME}")
set(TRIAL_PROJECT_NAME "${PROJECT_NAME}_trial")
set(LIB_GUI_PROJECT_NAME "${PROJECT_NAME}_lib_gui")
set(LIB_PROJECT_NAME "${PROJECT_NAME}_lib")
set(TEST_PROJECT_NAME "${PROJECT_NAME}_test")
@@ -35,19 +37,10 @@ if (UNIX)
endif ()
# Project ----------------------------------------------------------------------
project(${PROJECT_NAME})
if (UNIX AND NOT APPLE)
#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m32" CACHE STRING "c++ flags")
#set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m32" CACHE STRING "c flags")
#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m32" )
#set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m32" )
#set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -m32" )
endif ()
# Clang ------------------------------------------------------------------------
if (UNIX)
if ("${CMAKE_BUILD_TYPE}" STREQUAL "Release")
find_package(LLVM REQUIRED PATHS "$ENV{CLANG_DIR}/build_release/share/llvm/cmake")
@@ -86,14 +79,12 @@ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin/lib)
add_subdirectory(src/lib)
add_subdirectory(src/external)
set_source_files_properties(${CLANG_FILES} PROPERTIES COMPILE_FLAGS "-fno-rtti")
set_source_files_properties(${EXTERNAL_FILES} PROPERTIES COMPILE_FLAGS "-w")
set_source_files_properties(${EXTERNAL_C_FILES} PROPERTIES COMPILE_FLAGS "-std=gnu89 -w")
add_library(${LIB_PROJECT_NAME} ${LIB_FILES} ${CLANG_FILES} ${EXTERNAL_FILES} ${EXTERNAL_C_FILES})
add_library(${LIB_PROJECT_NAME} ${LIB_FILES} ${EXTERNAL_FILES} ${EXTERNAL_C_FILES})
create_source_groups(${LIB_FILES})
create_source_groups(${CLANG_FILES})
create_source_groups(${EXTERNAL_FILES})
create_source_groups(${EXTERNAL_C_FILES})
@@ -123,15 +114,12 @@ link_directories(${LLVM_LIBRARY_DIRS} ${CLANG_LIBRARY_DIRS} ${Boost_LIBRARY_DIRS
target_link_libraries(${LIB_PROJECT_NAME} ${CLANG_LIBRARIES} ${LLVM_AVAILABLE_LIBS} ${Boost_LIBRARIES})
# App --------------------------------------------------------------------------
# Lib Gui --------------------------------------------------------------------------
if (UNIX)
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin/app/${CMAKE_BUILD_TYPE})
else ()
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin/app/)
endif ()
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin/lib_gui)
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin/lib_gui)
add_subdirectory(src/app)
add_subdirectory(src/lib_gui)
# Find includes in corresponding build directories
set(CMAKE_INCLUDE_CURRENT_DIR ON)
@@ -162,14 +150,77 @@ add_custom_target(
versionnumber ALL
)
add_library(${LIB_GUI_PROJECT_NAME} ${LIB_GUI_FILES} ${CMAKE_SOURCE_DIR}/build/src/lib_gui/version.h)
# command for versioning script
add_custom_command(
TARGET versionnumber
PRE_BUILD
COMMAND ${CMAKE_COMMAND} -P ${CMAKE_SOURCE_DIR}/cmake/version.cmake
BYPRODUCTS ${PROJECT_SOURCE_DIR}/build/src/lib_gui/version.h
DEPENDS ${LIB_GUI_PROJECT_NAME}
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
COMMENT "check/update version number"
)
add_dependencies(${LIB_GUI_PROJECT_NAME} versionnumber)
create_source_groups(${LIB_GUI_FILES})
set_property(
TARGET ${LIB_GUI_PROJECT_NAME}
PROPERTY INCLUDE_DIRECTORIES
"${CMAKE_SOURCE_DIR}/src/lib"
"${CMAKE_SOURCE_DIR}/src/lib_gui"
"${CMAKE_SOURCE_DIR}/build/src/lib_gui"
)
# include external header without warnings
target_include_directories(${LIB_GUI_PROJECT_NAME} SYSTEM
PUBLIC "${CMAKE_SOURCE_DIR}/src/external"
PUBLIC ${Boost_INCLUDE_DIRS}
)
# Use the Widgets module from Qt 5.
qt5_use_modules(${LIB_GUI_PROJECT_NAME} Widgets)
qt5_use_modules(${LIB_GUI_PROJECT_NAME} Network)
# configure platform specific include file
configure_file(
"${PROJECT_SOURCE_DIR}/src/lib_gui/platform_includes/includes.h.in"
"${PROJECT_SOURCE_DIR}/build/src/lib_gui/includes.h"
)
#configure the versioning file
configure_file(
${CMAKE_SOURCE_DIR}/src/lib_gui/version.h.in
${CMAKE_SOURCE_DIR}/build/src/lib_gui/version.h
)
set(CMAKE_AUTOMOC OFF)
# App --------------------------------------------------------------------------
if (UNIX)
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin/app/${CMAKE_BUILD_TYPE})
else ()
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin/app/)
endif ()
add_subdirectory(src/app)
set_source_files_properties(${CLANG_FILES} PROPERTIES COMPILE_FLAGS "-fno-rtti")
# Find includes in corresponding build directories
set(CMAKE_INCLUDE_CURRENT_DIR ON)
if (WIN32)
file(WRITE ${CMAKE_SOURCE_DIR}/build/Coati.rc
"// Icon with lowest ID value placed first to ensure application icon\n"
"// remains consistent on all systems.\n"
"IDI_ICON1 ICON \"${CMAKE_SOURCE_DIR}/build/coati.ico\"\n"
)
add_executable(${APP_PROJECT_NAME} ${APP_FILES} ${CMAKE_SOURCE_DIR}/build/Coati.rc ${CMAKE_SOURCE_DIR}/build/src/app/version.h)
add_executable(${APP_PROJECT_NAME} ${APP_FILES} ${CLANG_FILES} ${CMAKE_SOURCE_DIR}/build/Coati.rc)
# hide the console when running a release build.
set_target_properties(${APP_PROJECT_NAME} PROPERTIES LINK_FLAGS_DEBUG "/SUBSYSTEM:CONSOLE")
set_target_properties(${APP_PROJECT_NAME} PROPERTIES COMPILE_DEFINITIONS_DEBUG "_CONSOLE")
@@ -179,31 +230,21 @@ if (WIN32)
set_target_properties(${APP_PROJECT_NAME} PROPERTIES LINK_FLAGS_MINSIZEREL "/SUBSYSTEM:WINDOWS")
else ()
add_executable(${APP_PROJECT_NAME} ${APP_FILES} ${CMAKE_SOURCE_DIR}/build/src/app/version.h)
add_executable(${APP_PROJECT_NAME} ${APP_FILES} ${CLANG_FILES})
endif ()
# command for versioning script
add_custom_command(
TARGET versionnumber
PRE_BUILD
COMMAND ${CMAKE_COMMAND} -P ${CMAKE_SOURCE_DIR}/cmake/version.cmake
BYPRODUCTS ${PROJECT_SOURCE_DIR}/build/src/app/version.h
DEPENDS ${APP_PROJECT_NAME}
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
COMMENT "check/update version number"
)
add_dependencies(${APP_PROJECT_NAME} versionnumber)
create_source_groups(${APP_FILES})
create_source_groups(${CLANG_FILES})
target_link_libraries(${APP_PROJECT_NAME} ${LIB_PROJECT_NAME})
target_link_libraries(${APP_PROJECT_NAME} ${LIB_GUI_PROJECT_NAME} ${LIB_PROJECT_NAME})
set_property(
TARGET ${APP_PROJECT_NAME}
PROPERTY INCLUDE_DIRECTORIES
"${CMAKE_SOURCE_DIR}/src/lib"
"${CMAKE_SOURCE_DIR}/src/app"
"${CMAKE_SOURCE_DIR}/build/src/app"
"${CMAKE_SOURCE_DIR}/src/lib"
"${CMAKE_SOURCE_DIR}/src/lib_gui"
"${CMAKE_SOURCE_DIR}/build/src/lib_gui"
)
target_include_directories(${APP_PROJECT_NAME} SYSTEM
@@ -215,25 +256,72 @@ target_include_directories(${APP_PROJECT_NAME} SYSTEM
qt5_use_modules(${APP_PROJECT_NAME} Widgets)
qt5_use_modules(${APP_PROJECT_NAME} Network)
# configure platform specific include file
configure_file(
"${PROJECT_SOURCE_DIR}/src/app/platform_includes/includes.h.in"
"${PROJECT_SOURCE_DIR}/build/src/app/includes.h"
)
#configure the versioning file
configure_file(
${CMAKE_SOURCE_DIR}/src/app/version.h.in
${CMAKE_SOURCE_DIR}/build/src/app/version.h
)
# add platform specific libraries
if (APPLE)
find_library(CORE_FOUNDATION CoreFoundation)
target_link_libraries(${APP_PROJECT_NAME} ${CORE_FOUNDATION})
endif ()
set(CMAKE_AUTOMOC OFF)
# Trial ---------------------------------------------------------------------
if (UNIX)
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin/app/${CMAKE_BUILD_TYPE})
else ()
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin/app/)
endif ()
add_subdirectory(src/trial)
# Find includes in corresponding build directories
set(CMAKE_INCLUDE_CURRENT_DIR ON)
if (WIN32)
file(WRITE ${CMAKE_SOURCE_DIR}/build/Coati.rc
"// Icon with lowest ID value placed first to ensure application icon\n"
"// remains consistent on all systems.\n"
"IDI_ICON1 ICON \"${CMAKE_SOURCE_DIR}/build/coati.ico\"\n"
)
add_executable(${TRIAL_PROJECT_NAME} ${TRIAL_FILES} ${CMAKE_SOURCE_DIR}/build/Coati.rc)
# hide the console when running a release build.
set_target_properties(${TRIAL_PROJECT_NAME} PROPERTIES LINK_FLAGS_DEBUG "/SUBSYSTEM:CONSOLE")
set_target_properties(${TRIAL_PROJECT_NAME} PROPERTIES COMPILE_DEFINITIONS_DEBUG "_CONSOLE")
set_target_properties(${TRIAL_PROJECT_NAME} PROPERTIES LINK_FLAGS_RELWITHDEBINFO "/SUBSYSTEM:CONSOLE")
set_target_properties(${TRIAL_PROJECT_NAME} PROPERTIES COMPILE_DEFINITIONS_RELWITHDEBINFO "_CONSOLE")
set_target_properties(${TRIAL_PROJECT_NAME} PROPERTIES LINK_FLAGS_RELEASE "/ENTRY:\"mainCRTStartup\" /SUBSYSTEM:WINDOWS")
set_target_properties(${TRIAL_PROJECT_NAME} PROPERTIES LINK_FLAGS_MINSIZEREL "/SUBSYSTEM:WINDOWS")
else ()
add_executable(${TRIAL_PROJECT_NAME} ${TRIAL_FILES})
endif ()
create_source_groups(${TRIAL_FILES})
target_link_libraries(${TRIAL_PROJECT_NAME} ${LIB_GUI_PROJECT_NAME} ${LIB_PROJECT_NAME})
set_property(
TARGET ${TRIAL_PROJECT_NAME}
PROPERTY INCLUDE_DIRECTORIES
"${CMAKE_SOURCE_DIR}/src/trial"
"${CMAKE_SOURCE_DIR}/src/lib"
"${CMAKE_SOURCE_DIR}/src/lib_gui"
"${CMAKE_SOURCE_DIR}/build/src/lib_gui"
)
target_include_directories(${TRIAL_PROJECT_NAME} SYSTEM
PUBLIC "${CMAKE_SOURCE_DIR}/src/external"
PUBLIC ${Boost_INCLUDE_DIRS}
)
# Use the Widgets module from Qt 5.
qt5_use_modules(${TRIAL_PROJECT_NAME} Widgets)
qt5_use_modules(${TRIAL_PROJECT_NAME} Network)
# add platform specific libraries
if (APPLE)
find_library(CORE_FOUNDATION CoreFoundation)
target_link_libraries(${TRIAL_PROJECT_NAME} ${CORE_FOUNDATION})
endif ()
# MacOSX Bundle ----------------------------------------------------------------
+2 -2
View File
@@ -30,6 +30,6 @@ AddLicense("Eigen" "http://eigen.tuxfamily.org" "${LICENSEFOLDER}/eigen_LICENSE.
set(LICENSE_ARRAY "${LICENSE_ARRAY}\n")
configure_file(
${CMAKE_SOURCE_DIR}/src/app/licenses.h.in
${CMAKE_SOURCE_DIR}/build/src/app/licenses.h
${CMAKE_SOURCE_DIR}/src/lib_gui/licenses.h.in
${CMAKE_SOURCE_DIR}/build/src/lib_gui/licenses.h
)
+2 -2
View File
@@ -43,6 +43,6 @@ message(STATUS "Git commit time: ${GIT_COMMIT_TIME}")
message(STATUS "Git version number:" ${GIT_VERSION_NUMBER} )
configure_file(
${CMAKE_SOURCE_DIR}/src/app/version.h.in
${CMAKE_SOURCE_DIR}/build/src/app/version.h
${CMAKE_SOURCE_DIR}/src/lib_gui/version.h.in
${CMAKE_SOURCE_DIR}/build/src/lib_gui/version.h
)
+6
View File
@@ -13,6 +13,9 @@ then
then
#echo "release test"
ninja -C build/Release Coati_test && cd bin/test && Release/Coati_test
elif [ "$2" = "trial" ]
then
ninja -C build/Release Coati_trial && cd bin/app && Release/Coati_trial
else
#echo "release app"
ninja -C build/Release Coati && cd bin/app && Release/Coati
@@ -23,6 +26,9 @@ then
then
#echo "debug test"
ninja -C build/Debug Coati_test && cd bin/test && Debug/Coati_test
elif [ "$2" = "trial" ]
then
ninja -C build/Debug Coati_trial && cd bin/app && Debug/Coati_trial
else
#echo "debug app"
ninja -C build/Debug Coati && cd bin/app && Debug/Coati
+38 -113
View File
@@ -1,119 +1,44 @@
add_files(
APP_FILES
platform_includes/includesDefault.h
platform_includes/includesMac.h
platform_includes/includesWindows.h
qt/element/QtAutocompletionList.cpp
qt/element/QtAutocompletionList.h
qt/element/QtCodeArea.cpp
qt/element/QtCodeArea.h
qt/element/QtCodeFile.cpp
qt/element/QtCodeFile.h
qt/element/QtCodeFileList.cpp
qt/element/QtCodeFileList.h
qt/element/QtCodeSnippet.cpp
qt/element/QtCodeSnippet.h
qt/element/QtDirectoryListBox.cpp
qt/element/QtDirectoryListBox.h
qt/element/QtLineEdit.cpp
qt/element/QtLineEdit.h
qt/element/QtRefreshBar.cpp
qt/element/QtRefreshBar.h
qt/element/QtSearchBar.cpp
qt/element/QtSearchBar.h
qt/element/QtSmartSearchBox.cpp
qt/element/QtSmartSearchBox.h
qt/element/QtStatusBar.cpp
qt/element/QtStatusBar.h
qt/element/QtUndoRedo.cpp
qt/element/QtUndoRedo.h
qt/graphics/QtAngledLineItem.cpp
qt/graphics/QtAngledLineItem.h
qt/graphics/QtCountCircleItem.cpp
qt/graphics/QtCountCircleItem.h
qt/graphics/QtRoundedRectItem.cpp
qt/graphics/QtRoundedRectItem.h
qt/graphics/QtStraightLineItem.cpp
qt/graphics/QtStraightLineItem.h
qt/network/QtIDECommunicationController.cpp
qt/network/QtIDECommunicationController.h
qt/network/QtNetworkFactory.cpp
qt/network/QtNetworkFactory.h
qt/network/QtTcpWrapper.cpp
qt/network/QtTcpWrapper.h
qt/utility/QtDeviceScaledPixmap.cpp
qt/utility/QtDeviceScaledPixmap.h
qt/utility/QtHighlighter.cpp
qt/utility/QtHighlighter.h
qt/utility/QtThreadedFunctor.h
qt/utility/utilityQt.cpp
qt/utility/utilityQt.h
qt/view/graphElements/nodeComponents/QtGraphNodeComponent.cpp
qt/view/graphElements/nodeComponents/QtGraphNodeComponent.h
qt/view/graphElements/nodeComponents/QtGraphNodeComponentClickable.cpp
qt/view/graphElements/nodeComponents/QtGraphNodeComponentClickable.h
qt/view/graphElements/nodeComponents/QtGraphNodeComponentMoveable.cpp
qt/view/graphElements/nodeComponents/QtGraphNodeComponentMoveable.h
qt/view/graphElements/QtGraphEdge.cpp
qt/view/graphElements/QtGraphEdge.h
qt/view/graphElements/QtGraphNode.cpp
qt/view/graphElements/QtGraphNode.h
qt/view/graphElements/QtGraphNodeAccess.cpp
qt/view/graphElements/QtGraphNodeAccess.h
qt/view/graphElements/QtGraphNodeBundle.cpp
qt/view/graphElements/QtGraphNodeBundle.h
qt/view/graphElements/QtGraphNodeData.cpp
qt/view/graphElements/QtGraphNodeData.h
qt/view/graphElements/QtGraphNodeExpandToggle.cpp
qt/view/graphElements/QtGraphNodeExpandToggle.h
qt/view/QtCodeView.cpp
qt/view/QtCodeView.h
qt/view/QtCompositeView.cpp
qt/view/QtCompositeView.h
qt/view/QtGraphView.cpp
qt/view/QtGraphView.h
qt/view/QtGraphViewStyleImpl.cpp
qt/view/QtGraphViewStyleImpl.h
qt/view/QtMainView.cpp
qt/view/QtMainView.h
qt/view/QtRefreshView.cpp
qt/view/QtRefreshView.h
qt/view/QtSearchView.cpp
qt/view/QtSearchView.h
qt/view/QtStatusBarView.cpp
qt/view/QtStatusBarView.h
qt/view/QtUndoRedoView.cpp
qt/view/QtUndoRedoView.h
qt/view/QtViewFactory.cpp
qt/view/QtViewFactory.h
qt/view/QtViewWidgetWrapper.cpp
qt/view/QtViewWidgetWrapper.h
qt/window/QtAbout.cpp
qt/window/QtAbout.h
qt/window/QtAboutLicense.cpp
qt/window/QtAboutLicense.h
qt/window/QtApplicationSettingsScreen.cpp
qt/window/QtApplicationSettingsScreen.h
qt/window/QtMainWindow.cpp
qt/window/QtMainWindow.h
qt/window/QtProjectSetupScreen.cpp
qt/window/QtProjectSetupScreen.h
qt/window/QtSettingsWindow.cpp
qt/window/QtSettingsWindow.h
qt/window/QtSplashScreen.cpp
qt/window/QtSplashScreen.h
qt/window/QtStartScreen.cpp
qt/window/QtStartScreen.h
data/parser/cxx/TaskParseCxx.cpp
isTrial.cpp
main.cpp
)
add_files(
CLANG_FILES
data/parser/cxx/name_resolver/CxxDeclNameResolver.cpp
data/parser/cxx/name_resolver/CxxDeclNameResolver.h
data/parser/cxx/name_resolver/CxxNameResolver.cpp
data/parser/cxx/name_resolver/CxxNameResolver.h
data/parser/cxx/name_resolver/CxxTemplateArgumentNameResolver.cpp
data/parser/cxx/name_resolver/CxxTemplateArgumentNameResolver.h
data/parser/cxx/name_resolver/CxxTypeNameResolver.cpp
data/parser/cxx/name_resolver/CxxTypeNameResolver.h
data/parser/cxx/ASTAction.cpp
data/parser/cxx/ASTAction.h
data/parser/cxx/ASTActionFactory.cpp
data/parser/cxx/ASTActionFactory.h
data/parser/cxx/ASTBodyVisitor.cpp
data/parser/cxx/ASTBodyVisitor.h
data/parser/cxx/ASTBodyVisitorClient.cpp
data/parser/cxx/ASTBodyVisitorClient.h
data/parser/cxx/ASTConsumer.cpp
data/parser/cxx/ASTConsumer.h
data/parser/cxx/ASTVisitor.cpp
data/parser/cxx/ASTVisitor.h
data/parser/cxx/CommentHandler.cpp
data/parser/cxx/CommentHandler.h
data/parser/cxx/CxxDiagnosticConsumer.cpp
data/parser/cxx/CxxDiagnosticConsumer.h
data/parser/cxx/CxxParser.cpp
data/parser/cxx/CxxParser.h
data/parser/cxx/PreprocessorCallbacks.cpp
data/parser/cxx/PreprocessorCallbacks.h
data/parser/cxx/utilityCxx.cpp
data/parser/cxx/utilityCxx.h
)
@@ -2,6 +2,7 @@
#include <sstream>
#include "data/parser/cxx/CxxParser.h"
#include "data/parser/ParserClient.h"
#include "utility/file/FileRegister.h"
#include "utility/messaging/type/MessageFinishedParsing.h"
@@ -15,7 +16,7 @@ TaskParseCxx::TaskParseCxx(
const std::vector<FilePath>& files
)
: m_client(client)
, m_parser(client, fileManager)
, m_parser(std::make_shared<CxxParser>(client, fileManager))
, m_arguments(arguments)
, m_files(files)
{
@@ -25,9 +26,9 @@ void TaskParseCxx::enter()
{
m_start = utility::durationStart();
m_parser.setupParsing(m_files, m_arguments);
m_parser->setupParsing(m_files, m_arguments);
for (const FilePath& path : m_parser.getFileRegister()->getUnparsedSourceFilePaths())
for (const FilePath& path : m_parser->getFileRegister()->getUnparsedSourceFilePaths())
{
m_sourcePaths.push(path.absolute());
}
@@ -40,7 +41,7 @@ Task::TaskState TaskParseCxx::update()
FilePath sourcePath;
bool isSource = false;
FileRegister* fileRegister = m_parser.getFileRegister();
FileRegister* fileRegister = m_parser->getFileRegister();
if (m_sourcePaths.size())
{
@@ -71,7 +72,7 @@ Task::TaskState TaskParseCxx::update()
m_client->prepareParsingFile(sourcePath);
m_parser.runTool(std::vector<std::string>(1, sourcePath.str()));
m_parser->runTool(std::vector<std::string>(1, sourcePath.str()));
m_client->finishParsingFile(sourcePath);
@@ -89,13 +90,13 @@ void TaskParseCxx::exit()
m_client->finishParsing();
FileRegister* fileRegister = m_parser.getFileRegister();
FileRegister* fileRegister = m_parser->getFileRegister();
MessageFinishedParsing(
fileRegister->getParsedFilesCount(),
fileRegister->getFilesCount(),
utility::duration(m_start),
m_parser.getParserClient()->getErrorCount()
m_parser->getParserClient()->getErrorCount()
).dispatch();
}
+6
View File
@@ -0,0 +1,6 @@
#include "isTrial.h"
bool isTrail()
{
return false;
}
+1 -36
View File
@@ -1,38 +1,3 @@
add_files(
CLANG_FILES
data/parser/cxx/name_resolver/CxxDeclNameResolver.cpp
data/parser/cxx/name_resolver/CxxDeclNameResolver.h
data/parser/cxx/name_resolver/CxxNameResolver.cpp
data/parser/cxx/name_resolver/CxxNameResolver.h
data/parser/cxx/name_resolver/CxxTemplateArgumentNameResolver.cpp
data/parser/cxx/name_resolver/CxxTemplateArgumentNameResolver.h
data/parser/cxx/name_resolver/CxxTypeNameResolver.cpp
data/parser/cxx/name_resolver/CxxTypeNameResolver.h
data/parser/cxx/ASTAction.cpp
data/parser/cxx/ASTAction.h
data/parser/cxx/ASTActionFactory.cpp
data/parser/cxx/ASTActionFactory.h
data/parser/cxx/ASTBodyVisitor.cpp
data/parser/cxx/ASTBodyVisitor.h
data/parser/cxx/ASTBodyVisitorClient.cpp
data/parser/cxx/ASTBodyVisitorClient.h
data/parser/cxx/ASTConsumer.cpp
data/parser/cxx/ASTConsumer.h
data/parser/cxx/ASTVisitor.cpp
data/parser/cxx/ASTVisitor.h
data/parser/cxx/CommentHandler.cpp
data/parser/cxx/CommentHandler.h
data/parser/cxx/CxxDiagnosticConsumer.cpp
data/parser/cxx/CxxDiagnosticConsumer.h
data/parser/cxx/CxxParser.cpp
data/parser/cxx/CxxParser.h
data/parser/cxx/PreprocessorCallbacks.cpp
data/parser/cxx/PreprocessorCallbacks.h
data/parser/cxx/utilityCxx.cpp
data/parser/cxx/utilityCxx.h
)
add_files(
LIB_FILES
@@ -154,7 +119,6 @@ add_files(
data/name/NameHierarchy.cpp
data/name/NameHierarchy.h
data/parser/cxx/TaskParseCxx.cpp
data/parser/cxx/TaskParseCxx.h
data/parser/ParseFunction.cpp
@@ -321,6 +285,7 @@ add_files(
Application.cpp
Application.h
isTrial.h
Project.cpp
Project.h
)
+6 -2
View File
@@ -1,12 +1,16 @@
#ifndef TASK_PARSE_CXX_H
#define TASK_PARSE_CXX_H
#include <memory>
#include <queue>
#include "data/parser/Parser.h"
#include "utility/scheduling/Task.h"
#include "utility/TimePoint.h"
#include "data/parser/cxx/CxxParser.h"
class ParserClient;
class FileManager;
class CxxParser;
class TaskParseCxx
: public Task
@@ -28,7 +32,7 @@ public:
private:
ParserClient* m_client;
CxxParser m_parser;
std::shared_ptr<CxxParser> m_parser;
const Parser::Arguments m_arguments;
const std::vector<FilePath> m_files;
+6
View File
@@ -0,0 +1,6 @@
#ifndef IS_TRIAL_H
#define IS_TRIAL_H
bool isTrial();
#endif // IS_TRIAL_H
+117
View File
@@ -0,0 +1,117 @@
add_files(
LIB_GUI_FILES
platform_includes/includesDefault.h
platform_includes/includesMac.h
platform_includes/includesWindows.h
qt/element/QtAutocompletionList.cpp
qt/element/QtAutocompletionList.h
qt/element/QtCodeArea.cpp
qt/element/QtCodeArea.h
qt/element/QtCodeFile.cpp
qt/element/QtCodeFile.h
qt/element/QtCodeFileList.cpp
qt/element/QtCodeFileList.h
qt/element/QtCodeSnippet.cpp
qt/element/QtCodeSnippet.h
qt/element/QtDirectoryListBox.cpp
qt/element/QtDirectoryListBox.h
qt/element/QtLineEdit.cpp
qt/element/QtLineEdit.h
qt/element/QtRefreshBar.cpp
qt/element/QtRefreshBar.h
qt/element/QtSearchBar.cpp
qt/element/QtSearchBar.h
qt/element/QtSmartSearchBox.cpp
qt/element/QtSmartSearchBox.h
qt/element/QtStatusBar.cpp
qt/element/QtStatusBar.h
qt/element/QtUndoRedo.cpp
qt/element/QtUndoRedo.h
qt/graphics/QtAngledLineItem.cpp
qt/graphics/QtAngledLineItem.h
qt/graphics/QtCountCircleItem.cpp
qt/graphics/QtCountCircleItem.h
qt/graphics/QtRoundedRectItem.cpp
qt/graphics/QtRoundedRectItem.h
qt/graphics/QtStraightLineItem.cpp
qt/graphics/QtStraightLineItem.h
qt/network/QtIDECommunicationController.cpp
qt/network/QtIDECommunicationController.h
qt/network/QtNetworkFactory.cpp
qt/network/QtNetworkFactory.h
qt/network/QtTcpWrapper.cpp
qt/network/QtTcpWrapper.h
qt/utility/QtDeviceScaledPixmap.cpp
qt/utility/QtDeviceScaledPixmap.h
qt/utility/QtHighlighter.cpp
qt/utility/QtHighlighter.h
qt/utility/QtThreadedFunctor.h
qt/utility/utilityQt.cpp
qt/utility/utilityQt.h
qt/view/graphElements/nodeComponents/QtGraphNodeComponent.cpp
qt/view/graphElements/nodeComponents/QtGraphNodeComponent.h
qt/view/graphElements/nodeComponents/QtGraphNodeComponentClickable.cpp
qt/view/graphElements/nodeComponents/QtGraphNodeComponentClickable.h
qt/view/graphElements/nodeComponents/QtGraphNodeComponentMoveable.cpp
qt/view/graphElements/nodeComponents/QtGraphNodeComponentMoveable.h
qt/view/graphElements/QtGraphEdge.cpp
qt/view/graphElements/QtGraphEdge.h
qt/view/graphElements/QtGraphNode.cpp
qt/view/graphElements/QtGraphNode.h
qt/view/graphElements/QtGraphNodeAccess.cpp
qt/view/graphElements/QtGraphNodeAccess.h
qt/view/graphElements/QtGraphNodeBundle.cpp
qt/view/graphElements/QtGraphNodeBundle.h
qt/view/graphElements/QtGraphNodeData.cpp
qt/view/graphElements/QtGraphNodeData.h
qt/view/graphElements/QtGraphNodeExpandToggle.cpp
qt/view/graphElements/QtGraphNodeExpandToggle.h
qt/view/QtCodeView.cpp
qt/view/QtCodeView.h
qt/view/QtCompositeView.cpp
qt/view/QtCompositeView.h
qt/view/QtGraphView.cpp
qt/view/QtGraphView.h
qt/view/QtGraphViewStyleImpl.cpp
qt/view/QtGraphViewStyleImpl.h
qt/view/QtMainView.cpp
qt/view/QtMainView.h
qt/view/QtRefreshView.cpp
qt/view/QtRefreshView.h
qt/view/QtSearchView.cpp
qt/view/QtSearchView.h
qt/view/QtStatusBarView.cpp
qt/view/QtStatusBarView.h
qt/view/QtUndoRedoView.cpp
qt/view/QtUndoRedoView.h
qt/view/QtViewFactory.cpp
qt/view/QtViewFactory.h
qt/view/QtViewWidgetWrapper.cpp
qt/view/QtViewWidgetWrapper.h
qt/window/QtAbout.cpp
qt/window/QtAbout.h
qt/window/QtAboutLicense.cpp
qt/window/QtAboutLicense.h
qt/window/QtApplicationSettingsScreen.cpp
qt/window/QtApplicationSettingsScreen.h
qt/window/QtMainWindow.cpp
qt/window/QtMainWindow.h
qt/window/QtProjectSetupScreen.cpp
qt/window/QtProjectSetupScreen.h
qt/window/QtSettingsWindow.cpp
qt/window/QtSettingsWindow.h
qt/window/QtSplashScreen.cpp
qt/window/QtSplashScreen.h
qt/window/QtStartScreen.cpp
qt/window/QtStartScreen.h
)
@@ -19,9 +19,9 @@
QtCodeFile::QtCodeFile(const FilePath& filePath, QtCodeFileList* parent)
: QFrame(parent)
, m_updateTitleBarFunctor(std::bind(&QtCodeFile::doUpdateTitleBar, this))
, m_parent(parent)
, m_filePath(filePath)
, m_updateTitleBarFunctor(std::bind(&QtCodeFile::doUpdateTitleBar, this))
{
setObjectName("code_file");

Some files were not shown because too many files have changed in this diff Show More