Changes between Version 65 and Version 66 of BuildAndDeploymentEnvironment

Timestamp:

Aug 31, 2022, 4:08:44 PM (21 months ago)

Author:

Andy Alt

Comment:

appimage:revise script

BuildAndDeploymentEnvironment

@@ -157 +157 @@
 {{{
 #!/bin/sh
-# install.sh
+# install.sh: Installs files to prepare for building an AppImage
+# Copyright 2022 The 0ad project
+# 
 set -ev # exit on error, be verbose
 
-#WORK_DIR=
+
+#ABS_PATH_WORK_DIR=
 #ABS_PATH_SRC_ROOT=/0ad
 
-if [ -z "${WORK_DIR}" ]; then
-  echo "set the work dir!"
+if [ ! -d "${ABS_PATH_WORK_DIR}" ]; then
+  echo "The work dir must be an absolute path to an existing directory."
   exit 1
 fi
 
-if [ -z "${ABS_PATH_SRC_ROOT}" ]; then
+if [ ! -r "${ABS_PATH_SRC_ROOT}/binaries/source/main.cpp" ]; then
   echo "set the source root!"
   exit 1
 fi
 
-cd $ABS_PATH_SRC_ROOT
-
-install -s binaries/system/pyrogenesis -Dt ${WORK_DIR}/AppRun/usr/bin
-install -s binaries/system/ActorEditor -Dt ${WORK_DIR}/AppRun/usr/bin
+APPDIR=${ABS_PATH_WORK_DIR}/AppDir
+
+cd ${ABS_PATH_SRC_ROOT}
+
+install -s binaries/system/pyrogenesis -Dt ${APPDIR}/usr/bin
+install -s binaries/system/ActorEditor -Dt ${APPDIR}/usr/bin
 
 # This loop uses 'patchelf', which may not be installed on some distros.
@@ -182 +187 @@
 # TODO: add code here to check for the existence of 'patchelf'
 
-cd ${WORK_DIR}/AppRun/usr/bin
+cd ${APPDIR}/usr/bin
 
 for lib in libmozjs78-ps-release.so \
@@ -195 +200 @@
 patchelf --set-rpath libAtlasUI.so:${ABS_PATH_SRC_ROOT}/binaries/system ActorEditor
 
-cd $ABS_PATH_SRC_ROOT
-
-install binaries/system/libCollada.so -Dt ${WORK_DIR}/AppRun/usr/lib
-install build/resources/0ad.appdata.xml -Dt ${WORK_DIR}/AppRun/usr/share/appdata
-install build/resources/0ad.desktop -Dt ${WORK_DIR}/AppRun/usr/share/applications
-install build/resources/0ad.png -Dt ${WORK_DIR}/AppRun/usr/share/pixmaps
-
-mkdir -p ${WORK_DIR}/AppRun/usr/data/config
-cp -a binaries/data/config/default.cfg ${WORK_DIR}/AppRun/usr/data/config
-
-cp -a binaries/data/l10n ${WORK_DIR}/AppRun/usr/data
+cd ${ABS_PATH_SRC_ROOT}
+
+install binaries/system/libCollada.so -Dt ${APPDIR}/usr/lib
+install build/resources/0ad.appdata.xml -Dt ${APPDIR}/usr/share/appdata
+install build/resources/0ad.desktop -Dt ${APPDIR}/usr/share/applications
+install build/resources/0ad.png -Dt ${APPDIR}/usr/share/pixmaps
+
+mkdir -p ${APPDIR}/usr/data/config
+cp -a binaries/data/config/default.cfg ${APPDIR}/usr/data/config
+
+cp -a binaries/data/l10n ${APPDIR}/usr/data
 
 # IMPORTANT: If you're creating the image from a distribution archive, this should copy
@@ -212 +217 @@
 # If you're using the svn/git version, you'll need to use the pyrogenesis
 # pyromod archive builder. It's recommended to create the two zip files
-# in a directory outside of the AppRun folder, in case you need to remove
-# the AppRun folder, and then copy them to ${WORK_DIR}/AppRun/usr/data
+# in a directory outside of the ${APPDIR} folder (in case you need to remove
+# the ${APPDIR} folder later) and then copy them to ${APPDIR}/usr/data
 # see https://trac.wildfiregames.com/wiki/Modding_Guide#Distributingyourmods
 #
-cp -a binaries/data/mods ${WORK_DIR}/AppRun/usr/data
+cp -a binaries/data/mods ${APPDIR}/usr/data
 
 # Remove any symlinks to mods that may be in binaries/data/mods (this will cause 0ad to crash
@@ -223 +228 @@
 }}}
 
-Note that binaries/system{libmoz*,libnv*} will be moved into the ${WORK_DIR}/AppRun folder automatically when linuxdeploy is run below.
-
-Change the Exec line in ${WORK_DIR}/AppRun/usr/share/applications/0ad.desktop to `pyrogenesis` and also change the Exec line for Atlas. 
+Note that binaries/system{libmoz*,libnv*} will be moved into the ${APPDIR} folder automatically when linuxdeploy is run below.
+
+Change the Exec line in ${APPDIR}/usr/share/applications/0ad.desktop to `pyrogenesis` and also change the Exec line for Atlas. 
 
 Get a copy of [https://github.com/linuxdeploy/linuxdeploy/releases linuxdeploy] (you can use `wget` to get the desired release/arch).
@@ -232 +237 @@
 
 {{{
-cd ${WORK_DIR}
-
-linuxdeploy -d AppRun/usr/share/applications/0ad.desktop \
-  --icon-file=AppRun/usr/share/pixmaps/0ad.png \
+cd ${ABS_PATH_WORK_DIR}
+
+linuxdeploy -d ${APPDIR}/usr/share/applications/0ad.desktop \
+  --icon-file=${APPDIR}/usr/share/pixmaps/0ad.png \
   --icon-filename=0ad \
-  --executable AppRun/usr/bin/pyrogenesis \
-  --appdir AppRun \
+  --executable ${APPDIR}/usr/bin/pyrogenesis \
+  --appdir ${APPDIR} \
   --output appimage
 }}}
@@ -244 +249 @@
 Other Notes:
 
-To test any changes you want to make to the appimage, or for debugging, you can make changes inside the '${WORK_DIR}/AppRun' folder, then cd back to '${WORK_DIR}/AppRun' and enter `./AppRun`. When satisfied, repeat the "Create image" step above.
+To test any changes you want to make to the appimage, or for debugging, you can make changes inside the '${APPDIR}' folder, then cd back to '${APPDIR}' and enter `./AppRun`. When satisfied, repeat the "Create image" step above.
 
 To use the --writableRoot option with the 0ad appimage, it must be extracted by providing the --appimage-extract option to the 0ad appimage. Then cd into squashfs-root, and type in `./AppRun --writableRoot`.