Changes between Version 63 and Version 64 of BuildAndDeploymentEnvironment

Timestamp:

Aug 31, 2022, 4:48:19 AM (21 months ago)

Author:

Andy Alt

Comment:

appimage:change $HOME to $WORK_DIR

BuildAndDeploymentEnvironment

@@ -160 +160 @@
 set -ev # exit on error, be verbose
 
+#WORK_DIR=
 #ABS_PATH_SRC_ROOT=/0ad
+
+if [ -z "${WORK_DIR}" ]; then
+  echo "set the work dir!"
+  exit 1
+fi
 
 if [ -z "${ABS_PATH_SRC_ROOT}" ]; then
@@ -169 +175 @@
 cd $ABS_PATH_SRC_ROOT
 
-install -s binaries/system/pyrogenesis -Dt $HOME/AppRun/usr/bin
-install -s binaries/system/ActorEditor -Dt $HOME/AppRun/usr/bin
+install -s binaries/system/pyrogenesis -Dt ${WORK_DIR}/AppRun/usr/bin
+install -s binaries/system/ActorEditor -Dt ${WORK_DIR}/AppRun/usr/bin
 
 # This loop uses 'patchelf', which may not be installed on some distros.
@@ -176 +182 @@
 # TODO: add code here to check for the existence of 'patchelf'
 
-cd $HOME/AppRun/usr/bin
+cd ${WORK_DIR}/AppRun/usr/bin
 
 for lib in libmozjs78-ps-release.so \
@@ -191 +197 @@
 cd $ABS_PATH_SRC_ROOT
 
-install binaries/system/libCollada.so -Dt $HOME/AppRun/usr/lib
-install build/resources/0ad.appdata.xml -Dt $HOME/AppRun/usr/share/appdata
-install build/resources/0ad.desktop -Dt $HOME/AppRun/usr/share/applications
-install build/resources/0ad.png -Dt $HOME/AppRun/usr/share/pixmaps
-
-mkdir -p $HOME/AppRun/usr/data/config
-cp -a binaries/data/config/default.cfg $HOME/AppRun/usr/data/config
-
-cp -a binaries/data/l10n $HOME/AppRun/usr/data
+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
 
 # IMPORTANT: If you're creating the image from a distribution archive, this should copy
@@ -207 +213 @@
 # 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 $HOME/AppRun/usr/data
+# the AppRun folder, and then copy them to ${WORK_DIR}/AppRun/usr/data
 # see https://trac.wildfiregames.com/wiki/Modding_Guide#Distributingyourmods
 #
-cp -a binaries/data/mods $HOME/AppRun/usr/data
+cp -a binaries/data/mods ${WORK_DIR}/AppRun/usr/data
 
 # Remove any symlinks to mods that may be in binaries/data/mods (this will cause 0ad to crash
@@ -217 +223 @@
 }}}
 
-Note that binaries/system{libmoz*,libnv*} will be moved into the AppRun folder automatically when linuxdeploy is run below.
-
-Change the Exec line in $HOME/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 ${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. 
 
 Get a copy of [https://github.com/linuxdeploy/linuxdeploy/releases linuxdeploy] (you can use `wget` to get the desired release/arch).
@@ -226 +232 @@
 
 {{{
-cd $HOME
+cd ${WORK_DIR}
 
 linuxdeploy -d AppRun/usr/share/applications/0ad.desktop \
@@ -238 +244 @@
 Other Notes:
 
-To test any changes you want to make to the appimage, or for debugging, you can make changes inside the 'AppRun' folder, then cd back to the base 'AppRun' folder 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 '${WORK_DIR}/AppRun' folder, then cd back to '${WORK_DIR}/AppRun' 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`.