Changeset 29577 for main/trunk/package-kits/linux/segments/build-core

Timestamp:

2014-12-10T18:46:19+13:00 (9 years ago)

Author:

Jeremy Symon

Message:

Lots of changes to get edit mode working. Changed variable marker to %var% instead of @var@ in order to differentiate from greenstone build variables, which allows variables to be used in patch files now. Added wget dependency. Enabled cgi scripts. Added patches to set correct settings in global.properties, gsdl3site.cfg.

File:

• main/trunk/package-kits/linux/segments/build-core (modified) (2 diffs)

main/trunk/package-kits/linux/segments/build-core

@@ -4 +4 @@
     export JAVA_HOME=$(java) ; \
     yes | ant prepare
-    patch -d src/ -p0 -N -i gs2build.patch || :
+    # apply patches
+    for patch in *.patch; do patch -d src/ -p0 -N -i $$patch; done || :
     cd src/gs2build/build-src ; \
     autoconf
@@ -16 +17 @@
     JAVA_HOME=$(java) ant install
     mv src/lib/jni/*.jar src/web/WEB-INF/lib/
-    # patch for gs2build tempdir
-    patch -d src/ -p0 -N -i perl-util.patch || :
     # delete windows/mac stuff
     find src/ -type d \( -iname "win32" -o -iname "windows" -o -iname "winutil" -o -iname "darwin" \) -exec rm -rf {} \; 2> /dev/null || :