Changeset 32234

Show
Ignore:
Timestamp:
02.07.2018 22:45:09 (5 months 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:
1 added
1 removed
2 modified

Legend:

Unmodified
Added
Removed
  • gs2-extensions/xpdf-tools/trunk/src/packages/CASCADE-MAKE/CMAKE.sh

    r32228 r32234  
    3131fi 
    3232 
    33 # Only compile if necessary - we don't edit these source files. 
    34 #if type -p cmake; then 
    35 #  echo "found cmake in PATH" 
    36 #  _CMAKE=cmake 
    37 #elif [[ -x "$GEXTXPDFTOOLS_INSTALLED/linux/bin/cmake" ]]; then 
    38 # NO. Rather, only compile up OUR cmake if we haven't already got OUR cmake 
     33# Only compile if necessary - we don't edit these source files: 
     34# Only compile up OUR cmake, and only if we haven't already got OUR cmake. 
    3935# But don't use any system cmake: xpdf-tools is dependent on cmake version (>= 2.8.8) 
    4036if [[ -x "$GEXTXPDFTOOLS_INSTALLED/linux/bin/cmake" ]]; then 
     
    5955 
    6056opt_run_tarclean $tarclean $package $version 
    61  
    62  
    63  
    64  
    65  
  • gs2-extensions/xpdf-tools/trunk/src/packages/CASCADE-MAKE/XPDFTOOLS.sh

    r32233 r32234  
    22 
    33# only going to make xpdf-tools, not xpdf-reader. So not making all of xpdf 
    4 package=gs-xpdf 
     4package=xpdf 
    55version=-4.00 
    66 
     
    2121 
    2222opt_run_untar $force_untar $auto_untar $package $version 
     23 
     24# patch the original tarball with our custom makefile? 
     25if [[ -d "$package$version/xpdf" && -f "gs-CMakeLists.txt" ]]; then 
     26    echo "*******************************************************************" 
     27    echo "Using our custom gs-CMakeLists.txt instead of the one included in $package$version" 
     28    echo "Renaming gs-CMakeLists.txt to $package$version/xpdf/CMakeLists.txt" 
     29    echo "*******************************************************************" 
     30 
     31    cp "gs-CMakeLists.txt" "$package$version/xpdf/CMakeLists.txt" 
     32fi 
    2333 
    2434# Whether force_config is set for this package depends on CMake test