Changeset 38017

Timestamp:

2023-09-04T19:32:49+12:00 (8 months ago)

Author:

anupama

Message:

Some changes for GS3, some info statements, and need to skip rebuilding Word-PDF-Enhanced model collections if OS where models are built is linux.

File:

• other-projects/nightly-tasks/diffcol/trunk/gen-model-colls.sh (modified) (5 diffs)

other-projects/nightly-tasks/diffcol/trunk/gen-model-colls.sh

@@ -267 +267 @@
     collection=$1
 
+    # Do not rebuild windows-specific collection(s) on non-windows OS
+    # https://stackoverflow.com/questions/2172352/in-bash-how-can-i-check-if-a-string-begins-with-some-value
+    if [ "x$GSDLOS" != "xwindows" ] && [ $collection == Word-PDF-Enhanced* ]; then
+    return;
+    fi
+    
     #escape the filename (in case of space) and get just the basename
     collection=$(get_col_basename $collection)
@@ -556 +562 @@
     source ./gs3-setup.sh
     cd "$GSDL3SRCHOME/web/sites/localsite"
+    echo "PERL_PERTURB_KEYS is $PERL_PERTURB_KEYS"
+    echo "PERL_HASH_SEED is $PERL_HASH_SEED"
+    #exit 1
     elif [ -e setup.bash ]; then
     source ./setup.bash
@@ -599 +608 @@
 fi
 # for GS2 need to make PDFv2Plugin.tmp functional, now that we have pdfbox
-if [ -e "$GSDLHOME/ext/pdf-box" ]; then
+if [ -e "$GSDLHOME/ext/pdf-box" ] && [ "x$GSDL3SRCHOME" == "x" ]; then
     if [ -e "$GSDLHOME/perllib/plugins/PDFv2Plugin.tmp" ]; then
     echo "** Renaming PDFv2Plugin.tmp to PDFv2Plugin.pm to work with pdf-box"
@@ -681 +690 @@
     #for each collection, import, build, move building to index
     for collection in collect/*; do
-    build_single_collection $collection;
-
-    if [ "x$mode" != "x" ]; then
-        #svn_process_single_collection $collection
-
-        if [ "x$mode" == "xsvnupdate" ]; then
-        update_single_collection $collection
-        elif [ "x$mode" == "xsvnaddnew" ]; then
-        svn_add_new_collection $collection
-        fi
-    fi
-    done
-
-    # having rebuilt all the collections, just the processing for svndelete remains:
-    if [ "x$mode" == "xsvndelete" ]; then
-    svn_delete
-    fi
-
-else
-    # Command-line args are a list of collections, 
-    # process each command-line arg, after confirming such a collection exists
-
-    for collection in "$@"; do
-    collection=collect/$collection
-    if test -e $collection; then   
+
+    if [ "x$GSDLOS" = "xwindows" ] || [ $collection != Word-PDF-Enhanced* ]; then
+        
         build_single_collection $collection;
-
+        
         if [ "x$mode" != "x" ]; then
         #svn_process_single_collection $collection
-
+        
         if [ "x$mode" == "xsvnupdate" ]; then
             update_single_collection $collection
         elif [ "x$mode" == "xsvnaddnew" ]; then
             svn_add_new_collection $collection
+        fi
+        fi
+    fi
+    done
+
+    # having rebuilt all the collections, just the processing for svndelete remains:
+    if [ "x$mode" == "xsvndelete" ]; then
+    svn_delete
+    fi
+
+else
+    # Command-line args are a list of collections, 
+    # process each command-line arg, after confirming such a collection exists
+
+    for collection in "$@"; do
+    collection=collect/$collection
+    if test -e $collection; then
+        if [ "x$GSDLOS" = "xwindows" ] || [ $collection != Word-PDF-Enhanced* ]; then
+        
+        build_single_collection $collection;
+        
+        if [ "x$mode" != "x" ]; then
+            #svn_process_single_collection $collection
+            
+            if [ "x$mode" == "xsvnupdate" ]; then
+            update_single_collection $collection
+            elif [ "x$mode" == "xsvnaddnew" ]; then
+            svn_add_new_collection $collection
+            fi
         fi
         fi
@@ -723 +739 @@
     fi
     done
-
+    
     # having rebuilt the specified collections above, just the processing for svndelete remains
     if [ "x$mode" == "xsvndelete" ]; then