diff --git a/scripts/ubuntu-install/createAppImage.sh b/scripts/ubuntu-install/createAppImage.sh index b2bbae6d..7cc18c00 100755 --- a/scripts/ubuntu-install/createAppImage.sh +++ b/scripts/ubuntu-install/createAppImage.sh @@ -1,16 +1,4 @@ -echo "start building build" -mkdir build -cd build -cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DBUILD_SHARED_LIBS=On -make -j 4 -echo "done building build" - -sudo make install DESTDIR=AppDir -ls ../ - -echo "copying " -sudo cp ../AppImage/librecad.* AppDir/ echo "done" wget https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage wget https://github.com/linuxdeploy/linuxdeploy-plugin-qt/releases/download/continuous/linuxdeploy-plugin-qt-x86_64.AppImage @@ -18,8 +6,8 @@ wget https://github.com/linuxdeploy/linuxdeploy-plugin-qt/releases/download/cont chmod a+x linuxdeploy-x86_64.AppImage chmod a+x linuxdeploy-plugin-qt-x86_64.AppImage -sudo cp ../AppImage/librecad.* AppDir/ -sudo cp /usr/local/lib/libdxfrw.so.1 AppDir/usr/lib +#sudo cp ../AppImage/librecad.* AppDir/ +#sudo cp /usr/local/lib/libdxfrw.so.1 AppDir/usr/lib sudo LD_LIBRARY_PATH=AppDir/usr/lib/x86_64-linux-gnu/:AppDir/usr/lib64:AppDir/usr/lib ./linuxdeploy-x86_64.AppImage --appdir AppDir --output appimage --executable AppDir/usr/bin/librecad --desktop-file AppDir/librecad.desktop --icon-file AppDir/librecad.svg --plugin qt diff --git a/scripts/ubuntu-install/installDependenciesAndBuildRepo.sh b/scripts/ubuntu-install/installDependenciesAndBuildRepo.sh index 44781e20..1744825c 100755 --- a/scripts/ubuntu-install/installDependenciesAndBuildRepo.sh +++ b/scripts/ubuntu-install/installDependenciesAndBuildRepo.sh @@ -19,20 +19,29 @@ libbz2-dev libglfw3-dev libglm-dev libfltk1.3-dev doxygen mkdocs qtchooser #sudo apt update #sudo apt install cmake echo on -cd /usr/src/gtest -sudo cmake CMakeLists.txt -sudo make +echo "building LibreCAD" +git submodule update +cmake . -DCMAKE_INSTALL_PREFIX=/usr -DBUILD_SHARED_LIBS=On +make -j 4 +echo "installing LibreCAD" +sudo make install DESTDIR=AppDir -cd lib #meeded in ubuntu 20.04+ -sudo cp ./*.a /usr/lib +#cd /usr/src/gtest +#sudo cmake CMakeLists.txt +#sudo make + + +#cd lib #meeded in ubuntu 20.04+ +#sudo cp ./*.a /usr/lib -cd git clone --branch LibreCAD_3 https://github.com/LibreCAD/libdxfrw cd libdxfrw mkdir release cd release -echo "start LibreCAD_3" -cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=ON .. -make -sudo make install -echo "done LibreCAD_3" +echo "building dxfrw" +cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr -DBUILD_SHARED_LIBS=On .. +make -j 4 +echo "installing dxfrw" +sudo make install DESTDIR=AppDir + +