Changeset 32480

Timestamp:

2018-09-24T15:37:45+12:00 (6 years ago)

Author:

ak19

Message:

When build-src/packages is compiling up anything in perllib/cpan that needs compiling, on macs and macs alone we now also compile up and install ZeroSSL's Crypt::LE perl package needed by for https certification on macs. This is done at the end of make all target of build-src/packages which runs cpan/compile-zerossl.sh to cascade-make it, while the end of the make clean target runs compile-zerossl.sh with the minus-minus-clean flag

Location:

main/trunk/greenstone2/build-src/packages

Files:

• Makefile (modified) (3 diffs)
• Makefile.in (modified) (3 diffs)

main/trunk/greenstone2/build-src/packages/Makefile

@@ -32 +32 @@
 # build-src/packages/configure. make clean and make distclean happen here.
 
+# For darwin, the end of make all will also cascade-make the Crypt::LE perl
+# package (configure-compile-install all its dependencies and Crypt::LE too)
+# used for https certification on macs.
+# Likewise, at make clean's end, clean is also run on Crypt::LE, uninstalling it.
+
 PACKAGEDIRS = 
 
@@ -62 +67 @@
           (cd $$idir && $(MAKE) install) || exit 1; \
         done
+    if [[ $(GSDLOS) = "darwin" ]]; then \
+      (cd ../../perllib/cpan && ./compile-zerossl.sh || exit 0) ; \
+    fi
 
 clean:
@@ -68 +76 @@
           (cd $$subdir && $(MAKE) clean || exit 0) ; \
         done
+    if [[ $(GSDLOS) = "darwin" ]]; then \
+      (cd ../../perllib/cpan && ./compile-zerossl.sh --clean || exit 0) ; \
+    fi
 
 distclean:

main/trunk/greenstone2/build-src/packages/Makefile.in

@@ -32 +32 @@
 # build-src/packages/configure. make clean and make distclean happen here.
 
+# For darwin, the end of make all will also cascade-make the Crypt::LE perl
+# package (configure-compile-install all its dependencies and Crypt::LE too)
+# used for https certification on macs.
+# Likewise, at make clean's end, clean is also run on Crypt::LE, uninstalling it.
+
 PACKAGEDIRS = 
 
@@ -62 +67 @@
           (cd $$idir && $(MAKE) install) || exit 1; \
         done
+    if [[ $(GSDLOS) = "darwin" ]]; then \
+      (cd ../../perllib/cpan && ./compile-zerossl.sh || exit 0) ; \
+    fi
 
 clean:
@@ -68 +76 @@
           (cd $$subdir && $(MAKE) clean || exit 0) ; \
         done
+    if [[ $(GSDLOS) = "darwin" ]]; then \
+      (cd ../../perllib/cpan && ./compile-zerossl.sh --clean || exit 0) ; \
+    fi
 
 distclean: