Changeset 27035 for documentation/trunk/shared

Timestamp:

2013-03-11T19:03:04+13:00 (11 years ago)

Author:

ak19

Message:

1. Bringing Windows script generate-html.bat up to speed with changes to Linux script generate-html.sh that were made in revision 25767. 2. Tested on Windows: important changes to both scripts as well as Dictionary.java to get the tutorials generated when using a GS3 installation (when a gs3-setup file is sourced).

Location:

documentation/trunk/shared

Files:

• Dictionary$MacroFile.class (modified) ( previous)
• Dictionary$MyClassLoader.class (modified) ( previous)
• Dictionary.class (modified) ( previous)
• Dictionary.java (modified) (7 diffs)

documentation/trunk/shared/Dictionary.java

@@ -40 +40 @@
 
     protected String gsdl_home = null;
+    protected String gsdl_or_gsdl3src_home = null;
     
     private ClassLoader classloader = null;
@@ -55 +56 @@
         System.exit(1);
     }
+    
+    // Creating var gsdl_or_gsdl3src_home to point to GSDLHOME for GS2 and GSDL3SRCHOME for GS3
+    // since in GS3, gli is located in GSDL3SRCHOME, not in GSDLHOME (gs2build) 
+    String gsdl3_src_home = System.getProperty("GSDL3SRCHOME");
+    if(gsdl3_src_home == null || gsdl3_src_home.equals("")) { // both tests important
+        gsdl_or_gsdl3src_home = gsdl_home; // for GS2, all subfolders including gli are located in GSDLHOME
+    } else {
+        gsdl_or_gsdl3src_home = gsdl3_src_home;
+    }
 
     this.classloader = new MyClassLoader(this.getClass().getClassLoader());
@@ -63 +73 @@
     }
     public String get(String key, String args) {
+    
+    boolean isGS3 = false;
+    String gsdl3_src_home = System.getProperty("GSDL3SRCHOME");
+    if(gsdl3_src_home != null && !gsdl3_src_home.equals("")) {
+        File gs3_installation = new File (gsdl3_src_home);
+        if(gs3_installation.exists()) {
+            isGS3 = true;
+        }
+    }
+    
     int pos = key.indexOf("::");
     if (pos==-1) {
@@ -76 +96 @@
         return getDictionaryText(glidict, key_name, args);
     }
-    if (package_name.equals("coredm")) {
-        loadDictionary(COREDM);
-        return getMacroText(core_macros, key_name);
-    }
     if (package_name.equals("perlmodules")) {
         loadDictionary(PERLMODULES);
         return getDictionaryText(perldict, key_name, args);
     }
-    if (package_name.equals("auxdm")) {
-        loadDictionary(AUXDM);
-        return getMacroText(aux_macros, key_name);
-    }
+    if(!isGS3) {
+        if (package_name.equals("coredm")) {
+            loadDictionary(COREDM);
+            return getMacroText(core_macros, key_name);
+        }
+        if (package_name.equals("auxdm")) {
+            loadDictionary(AUXDM);
+            return getMacroText(aux_macros, key_name);
+        }
+    }   
     if (package_name.equals("glihelp")) {
         return "";
@@ -103 +125 @@
         return key_name;
     }
-    System.err.println("invalid package name "+package_name);
+    if(isGS3 && (package_name.equals("coredm") || package_name.equals("auxdm"))) {
+        //System.err.println("(package "+package_name+" does not exist for GS3)");
+    } else {
+        System.err.println("invalid package name "+package_name);
+    }
     return "";
     }
@@ -243 +269 @@
     }
     
-    file_name = gsdl_home + File.separator + "gli" + File.separator + "metadata"+ File.separator + file_name;
+    file_name = gsdl_or_gsdl3src_home + File.separator + "gli" + File.separator + "metadata"+ File.separator + file_name;
     //System.err.println("metadata filename = "+file_name);
     File metadata_file = new File(file_name);
@@ -286 +312 @@
 
         super(parent);
-        gliclassesdir = gsdl_home+File.separator+"gli"+File.separator+"classes";
+        gliclassesdir = gsdl_or_gsdl3src_home+File.separator+"gli"+File.separator+"classes";
         perldir = gsdl_home+File.separator+"perllib";