build: linux package private beta

update linux package for private beta
This commit is contained in:
Andreas Stallinger
2015-10-20 17:12:05 +02:00
parent 52494ba402
commit 5af8800eed
5 changed files with 28 additions and 4 deletions
+20 -1
View File
@@ -6,14 +6,33 @@
INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/bin/app/data
DESTINATION share/coati/.config/coati
PATTERN "log/*" EXCLUDE
PATTERN "projects/*" EXCLUDE
PATTERN "projects" EXCLUDE
PATTERN "src" EXCLUDE
PATTERN "ApplicationSettings.xml" EXCLUDE
PATTERN "ApplicationSettings_distr.xml" EXCLUDE
PATTERN "ProjectSettings_template.xml" EXCLUDE
PATTERN "ApplicationSettings_template.xml" EXCLUDE
)
INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/bin/app/data/src/tictactoe
DESTINATION share/coati/.config/coati/data/projects
)
INSTALL(FILES ${CMAKE_SOURCE_DIR}/bin/app/data/projects/tictactoe.xml
DESTINATION share/coati/.config/coati/data/projects/tictactoe
)
INSTALL(FILES ${CMAKE_SOURCE_DIR}/bin/app/data/ApplicationSettings_distr.xml
DESTINATION share/coati/.config/coati/data
RENAME ApplicationSettings.xml)
INSTALL(FILES ${CMAKE_SOURCE_DIR}/setup/Linux/coati.desktop
DESTINATION share/applications
)
INSTALL(FILES ${CMAKE_SOURCE_DIR}/bin/app/data/gui/icon/logo_1024_1024.png
DESTINATION share/icons
RENAME coati.png)
INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/setup/Linux/lib
DESTINATION share/coati
)
+5
View File
@@ -1,3 +1,8 @@
#!/bin/sh
mkdir -p setup/Linux/lib
ldd bin/app/Release/Coati | grep "=> /" | awk '{print $3}' | xargs -I '{}' cp -v '{}' setup/Linux/lib
# extra files needed and not copied with the lines above
cp /usr/lib/qt/plugins/platforms/libqxcb.so setup/Linux
cp /usr/lib/libQt5XcbQpa.so.5 setup/Linux/lib
cp /usr/lib/libQt5DBus.so.5 setup/Linux/lib
Binary file not shown.
@@ -8,8 +8,8 @@
#include "data/access/StorageAccess.h"
UndoRedoController::UndoRedoController(StorageAccess* storageAccess)
: m_storageAccess(storageAccess)
, m_activationTranslator(storageAccess)
: m_activationTranslator(storageAccess)
, m_storageAccess(storageAccess)
, m_lastCommand(nullptr, 0)
{
}
+1 -1
View File
@@ -153,7 +153,7 @@ std::shared_ptr<clang::tooling::FixedCompilationDatabase> CxxParser::getCompilat
clang::tooling::FixedCompilationDatabase::loadFromCommandLine(argc, argv)
);
delete argv;
delete[] argv;
if (!compilationDatabase)
{