build: linux package fix
some linux package fixes and now there is a package option in the build.sh script
This commit is contained in:
@@ -1,4 +1,5 @@
|
||||
/build/
|
||||
/distr/
|
||||
|
||||
/bin/app/Debug/
|
||||
/bin/app/Release/
|
||||
|
||||
+1
-5
@@ -360,11 +360,7 @@ if(UNIX AND NOT APPLE)
|
||||
${CMAKE_SOURCE_DIR}/setup/Linux/Coati.sh
|
||||
DESTINATION share/coati
|
||||
)
|
||||
INSTALL(CODE "execute_process(COMMAND \"${CMAKE_COMMAND}\" -E create_symlink
|
||||
/usr/local/share/coati/Coati.sh
|
||||
/usr/local/bin/coati
|
||||
)")
|
||||
INSTALL(PROGRAMS /usr/local/bin/coati
|
||||
INSTALL(PROGRAMS ${CMAKE_SOURCE_DIR}/setup/Linux/coati
|
||||
DESTINATION bin/
|
||||
)
|
||||
# add the automatically determined parts of the RPATH
|
||||
|
||||
@@ -27,6 +27,11 @@ then
|
||||
#echo "debug app"
|
||||
ninja -C build/Debug Coati && cd bin/app && Debug/Coati
|
||||
fi
|
||||
elif [ "$1" = "package" ] || [ "$1" = "p" ]
|
||||
then
|
||||
ninja package -C build/Release Coati
|
||||
mkdir -p distr && cp build/Release/Coati*.deb distr && cp build/Release/Coati*.tar.gz distr
|
||||
echo "Packages copied into the distr folder"
|
||||
else
|
||||
echo "no arguments: first argument 'release' or 'debug', second argument 'test' for tests"
|
||||
fi
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#!/bin/sh
|
||||
if [ ! -d "~/.config/coati" ]; then
|
||||
if [ ! -d "${HOME}/.config/coati" ]; then
|
||||
# Control will enter here if $DIRECTORY doesn't exist.
|
||||
cp -r /usr/local/share/coati/.config/coati ~/.config/coati
|
||||
cp -r /usr/local/share/coati/.config/coati ${HOME}/.config/coati
|
||||
echo "First start of Coati from this user, copy default configfiles to ~/.config/coati"
|
||||
fi
|
||||
|
||||
|
||||
Symlink
+1
@@ -0,0 +1 @@
|
||||
/usr/local/share/coati/Coati.sh
|
||||
@@ -32,8 +32,6 @@ void QtAboutLicense::setup()
|
||||
|
||||
void QtAboutLicense::populateForm(QFormLayout* layout)
|
||||
{
|
||||
int minimumWidthForSecondCol = 360;
|
||||
|
||||
for(ThirdPartyLicense license : licenses3rdParties)
|
||||
{
|
||||
QLabel* licenseName = new QLabel();
|
||||
|
||||
Reference in New Issue
Block a user