Changeset 32239 for gs2-extensions

Timestamp:

2018-07-05T22:57:28+12:00 (6 years ago)

Author:

ak19

Message:

Committing new helper script move-cmake.sh that will move cmake out of or back into the compilation area. These 2 functions of the script are called by XPDFTOOL.sh after compiling up xpdftools and by CMAKE.sh when searching for an existing CMake within the xpdftools extension to compile up xpdftools.

Location:

gs2-extensions/xpdf-tools/trunk/src

Files:

• move-cmake.sh (added)
• packages/CASCADE-MAKE/CMAKE.sh (modified) (1 diff)
• packages/CASCADE-MAKE/XPDFTOOLS.sh (modified) (1 diff)

gs2-extensions/xpdf-tools/trunk/src/packages/CASCADE-MAKE/CMAKE.sh

@@ -31 +31 @@
 fi
 
+# Check that CMake products weren't just moved out of the distribution area,
+# before recompiling all of CMake
+if [[ ! -e "$GEXTXPDFTOOLS_INSTALLED/bin/cmake" && -e "$GEXT_XPDFTOOLS/devel/$GSDLOS/bin/cmake" ]]; then
+    echo "**************************************"
+    echo "Moving intermediary CMake products back for development"
+    $GEXT_XPDFTOOLS/move-cmake.sh back
+    echo "**************************************"
+else
+    echo "@@@@ $GEXT_XPDFTOOLS/devel/$GSDLOS/bin/cmake does not exist"
+    echo "**************************************"
+fi
+
 # Only compile if necessary - we don't edit these source files:
 # Only compile up OUR cmake, and only if we haven't already got OUR cmake.

gs2-extensions/xpdf-tools/trunk/src/packages/CASCADE-MAKE/XPDFTOOLS.sh

@@ -123 +123 @@
 # If compilation was successful, then we don't need cmake binaries anymore when
 # packaging up xpdf-tools
+
+if [ -f "$GEXTXPDFTOOLS_INSTALLED/bin/pdftohtml" ]; then
+    echo "**************************************"
+    echo "Moving intermediary CMake products out of the distribution area"
+    $GEXT_XPDFTOOLS/move-cmake.sh away
+    echo "**************************************"
+fi
+
+#if [ -f "$installed/bin/pdftohtml" ]; then
+#    echo "XpdfTools compilation appears successful (pdftohtml's been generated)"
+#    echo "If ready to distribute, run:"
+#    echo "    move-cmake.sh away"
+#    echo "  to move intermediary products (CMake) out of the distribution area."
+#    echo "You can undo this when returning to re-compile by first running:"
+#    echo "    move-cmake.sh back"
+#fi