Changeset 32234 for gs2-extensions/xpdf-tools/trunk/src

Timestamp:

2018-07-02T22:45:09+12:00 (6 years ago)

Author:

ak19

Message:

Introducing gs-CMakeLists.txt as a GS customised CMakeLists.txt to replace the one in the xpdf tools src code package once the latter's been untarred. XPDFTools.sh takes care of doing the replacement after the untar operation. Minor cleanup to CMAKE.sh

Location:

gs2-extensions/xpdf-tools/trunk/src/packages

Files:

• CASCADE-MAKE/CMAKE.sh (modified) (2 diffs)
• CASCADE-MAKE/XPDFTOOLS.sh (modified) (2 diffs)
• CMakeLists.txt (deleted)
• gs-CMakeLists.txt (added)

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

@@ -31 +31 @@
 fi
 
-# Only compile if necessary - we don't edit these source files.
-#if type -p cmake; then
-#  echo "found cmake in PATH"
-#  _CMAKE=cmake
-#elif [[ -x "$GEXTXPDFTOOLS_INSTALLED/linux/bin/cmake" ]]; then
-# NO. Rather, only compile up OUR cmake if we haven't already got OUR cmake
+# 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.
 # But don't use any system cmake: xpdf-tools is dependent on cmake version (>= 2.8.8)
 if [[ -x "$GEXTXPDFTOOLS_INSTALLED/linux/bin/cmake" ]]; then
@@ -59 +55 @@
 
 opt_run_tarclean $tarclean $package $version
-
-
-
-
-

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

@@ -2 +2 @@
 
 # only going to make xpdf-tools, not xpdf-reader. So not making all of xpdf
-package=gs-xpdf
+package=xpdf
 version=-4.00
 
@@ -21 +21 @@
 
 opt_run_untar $force_untar $auto_untar $package $version
+
+# patch the original tarball with our custom makefile?
+if [[ -d "$package$version/xpdf" && -f "gs-CMakeLists.txt" ]]; then
+    echo "*******************************************************************"
+    echo "Using our custom gs-CMakeLists.txt instead of the one included in $package$version"
+    echo "Renaming gs-CMakeLists.txt to $package$version/xpdf/CMakeLists.txt"
+    echo "*******************************************************************"
+
+    cp "gs-CMakeLists.txt" "$package$version/xpdf/CMakeLists.txt"
+fi
 
 # Whether force_config is set for this package depends on CMake test