Changeset 27035
- Timestamp:
- 2013-03-11T19:03:04+13:00 (11 years ago)
- Location:
- documentation/trunk
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
documentation/trunk/shared/Dictionary.java
r13632 r27035 40 40 41 41 protected String gsdl_home = null; 42 protected String gsdl_or_gsdl3src_home = null; 42 43 43 44 private ClassLoader classloader = null; … … 55 56 System.exit(1); 56 57 } 58 59 // Creating var gsdl_or_gsdl3src_home to point to GSDLHOME for GS2 and GSDL3SRCHOME for GS3 60 // since in GS3, gli is located in GSDL3SRCHOME, not in GSDLHOME (gs2build) 61 String gsdl3_src_home = System.getProperty("GSDL3SRCHOME"); 62 if(gsdl3_src_home == null || gsdl3_src_home.equals("")) { // both tests important 63 gsdl_or_gsdl3src_home = gsdl_home; // for GS2, all subfolders including gli are located in GSDLHOME 64 } else { 65 gsdl_or_gsdl3src_home = gsdl3_src_home; 66 } 57 67 58 68 this.classloader = new MyClassLoader(this.getClass().getClassLoader()); … … 63 73 } 64 74 public String get(String key, String args) { 75 76 boolean isGS3 = false; 77 String gsdl3_src_home = System.getProperty("GSDL3SRCHOME"); 78 if(gsdl3_src_home != null && !gsdl3_src_home.equals("")) { 79 File gs3_installation = new File (gsdl3_src_home); 80 if(gs3_installation.exists()) { 81 isGS3 = true; 82 } 83 } 84 65 85 int pos = key.indexOf("::"); 66 86 if (pos==-1) { … … 76 96 return getDictionaryText(glidict, key_name, args); 77 97 } 78 if (package_name.equals("coredm")) {79 loadDictionary(COREDM);80 return getMacroText(core_macros, key_name);81 }82 98 if (package_name.equals("perlmodules")) { 83 99 loadDictionary(PERLMODULES); 84 100 return getDictionaryText(perldict, key_name, args); 85 101 } 86 if (package_name.equals("auxdm")) { 87 loadDictionary(AUXDM); 88 return getMacroText(aux_macros, key_name); 89 } 102 if(!isGS3) { 103 if (package_name.equals("coredm")) { 104 loadDictionary(COREDM); 105 return getMacroText(core_macros, key_name); 106 } 107 if (package_name.equals("auxdm")) { 108 loadDictionary(AUXDM); 109 return getMacroText(aux_macros, key_name); 110 } 111 } 90 112 if (package_name.equals("glihelp")) { 91 113 return ""; … … 103 125 return key_name; 104 126 } 105 System.err.println("invalid package name "+package_name); 127 if(isGS3 && (package_name.equals("coredm") || package_name.equals("auxdm"))) { 128 //System.err.println("(package "+package_name+" does not exist for GS3)"); 129 } else { 130 System.err.println("invalid package name "+package_name); 131 } 106 132 return ""; 107 133 } … … 243 269 } 244 270 245 file_name = gsdl_ home + File.separator + "gli" + File.separator + "metadata"+ File.separator + file_name;271 file_name = gsdl_or_gsdl3src_home + File.separator + "gli" + File.separator + "metadata"+ File.separator + file_name; 246 272 //System.err.println("metadata filename = "+file_name); 247 273 File metadata_file = new File(file_name); … … 286 312 287 313 super(parent); 288 gliclassesdir = gsdl_ home+File.separator+"gli"+File.separator+"classes";314 gliclassesdir = gsdl_or_gsdl3src_home+File.separator+"gli"+File.separator+"classes"; 289 315 perldir = gsdl_home+File.separator+"perllib"; 290 316 -
documentation/trunk/tutorials/generate-html.bat
r25472 r27035 9 9 goto exit 10 10 11 :generate: 11 12 setlocal 12 13 13 set top_dir=%CD% 14 14 set source_dir=%CD%\xml-source 15 15 set processing_dir=%CD%\processing 16 16 set output_dir=%CD%\html 17 :generate: 18 if not exist "%output_dir" mkdir %output_dir% 17 set tmp_dir=%CD%\tmp 18 if not exist "%output_dir%" mkdir %output_dir% 19 if not exist "%tmp_dir%" mkdir %tmp_dir% 19 20 cd .. 20 21 cd shared … … 23 24 24 25 25 set CLASSPATH=%shared_dir%;%GSDLHOME%\gli;%GSDLHOME%\gli\classes;%GSDLHOME%\perllib;%shared_dir%\xalan.jar 26 set GSDL_OR_GSDL3SRC_HOME=%GSDLHOME% 27 :: this environment variable varies for GS3, where GLI is located in GSDL3SRCHOME (GS3) and not in GSDLHOME (gs2build) 28 if not "%GSDL3SRCHOME%" == "" if exist "%GSDL3SRCHOME%" ( 29 set GSDL_OR_GSDL3SRC_HOME=%GSDL3SRCHOME% 30 ) 26 31 32 set CLASSPATH=%shared_dir%;%GSDLHOME%\gli;%GSDL_OR_GSDL3SRC_HOME%\gli\classes;%GSDLHOME%\perllib;%shared_dir%\xalan.jar 33 34 :: preprocess-tut-xml.xsl removes all the non-matching MajorVersion tags first 35 :: This needs to be done in a separate pass, to ensure NumberedItems nested in 36 :: MajorVersion tags preserve their numbering. 27 37 echo "processing top level index" 28 29 java -cp "%CLASSPATH%" -DGSDLHOME="%GSDLHOME%" ApplyXSLT "en" "%processing_dir%\xml-to-top-index.xsl" "%source_dir%\tutorial_en.xml" %* > "%output_dir%\index.html"38 java -cp "%CLASSPATH%" -DGSDLHOME="%GSDLHOME%" -DGSDL3SRCHOME="%GSDL3SRCHOME%" ApplyXSLT "en" "%processing_dir%\preprocess-tut-xml.xsl" "%source_dir%\tutorial_en.xml" %* > "%tmp_dir%\tutorial_en.xml" 39 java -cp "%CLASSPATH%" -DGSDLHOME="%GSDLHOME%" -DGSDL3SRCHOME="%GSDL3SRCHOME%" ApplyXSLT "en" "%processing_dir%\xml-to-top-index.xsl" "%tmp_dir%\tutorial_en.xml" %* > "%output_dir%\index.html" 30 40 31 41 echo "generating wiki index page" 32 java -cp "%CLASSPATH%" -DGSDLHOME="%GSDLHOME%" ApplyXSLT "en" "%processing_dir%\xml-to-wiki-index.xsl" "%source_dir%\tutorial_en.xml" %* > "%output_dir%\wiki-index.txt"42 java -cp "%CLASSPATH%" -DGSDLHOME="%GSDLHOME%" -DGSDL3SRCHOME="%GSDL3SRCHOME%" ApplyXSLT "en" "%processing_dir%\xml-to-wiki-index.xsl" "%tmp_dir%\tutorial_en.xml" %* > "%output_dir%\wiki-index.txt" 33 43 34 44 35 45 for %%G IN (en,fr,ru,es) do ( 36 if not exist " html\%%G" mkdir html\%%G46 if not exist "%output_dir%\%%G" mkdir "%output_dir%\%%G" 37 47 38 echo "proces ing %%G version"48 echo "processing %%G version" 39 49 cd %output_dir%\%%G 40 java -cp "%CLASSPATH%" -DGSDLHOME="%GSDLHOME%" ApplyXSLT %%G "%processing_dir%\xml-to-index.xsl" "%source_dir%\tutorial_%%G.xml" %* > "index.html" 41 java -cp "%CLASSPATH%" -DGSDLHOME="%GSDLHOME%" ApplyXSLT %%G "%processing_dir%\xml-to-one-html.xsl" "%source_dir%\tutorial_%%G.xml" %* > "all_tutorials.html" 42 java -cp "%CLASSPATH%" -DGSDLHOME="%GSDLHOME%" ApplyXSLT %%G "%processing_dir%\xml-to-many-html.xsl" "%source_dir%\tutorial_%%G.xml" %* | perl -S "%GSDLHOME%\gli\help\splithelpdocument.pl" 50 51 if not "%%G" == "en" java -cp "%CLASSPATH%" -DGSDLHOME="%GSDLHOME%" -DGSDL3SRCHOME="%GSDL3SRCHOME%" ApplyXSLT %%G "%processing_dir%\preprocess-tut-xml.xsl" "%source_dir%\tutorial_%%G.xml" %* > "%tmp_dir%\tutorial_%%G.xml" 52 53 java -cp "%CLASSPATH%" -DGSDLHOME="%GSDLHOME%" -DGSDL3SRCHOME="%GSDL3SRCHOME%" ApplyXSLT %%G "%processing_dir%\xml-to-index.xsl" "%tmp_dir%\tutorial_%%G.xml" %* > "index.html" 54 java -cp "%CLASSPATH%" -DGSDLHOME="%GSDLHOME%" -DGSDL3SRCHOME="%GSDL3SRCHOME%" ApplyXSLT %%G "%processing_dir%\xml-to-one-html.xsl" "%tmp_dir%\tutorial_%%G.xml" %* > "all_tutorials.html" 55 java -cp "%CLASSPATH%" -DGSDLHOME="%GSDLHOME%" -DGSDL3SRCHOME="%GSDL3SRCHOME%" ApplyXSLT %%G "%processing_dir%\xml-to-many-html.xsl" "%tmp_dir%\tutorial_%%G.xml" %* | perl -S "%GSDL_OR_GSDL3SRC_HOME%\gli\help\splithelpdocument.pl" 43 56 cd .. 44 57 ) -
documentation/trunk/tutorials/generate-html.sh
r25767 r27035 21 21 tmp_dir=`pwd`/tmp 22 22 23 export CLASSPATH=$shared_dir:$GSDLHOME/gli:$GSDLHOME/gli/classes:$GSDLHOME/perllib:$shared_dir/xalan.jar 23 24 export GSDL_OR_GSDL3SRC_HOME=$GSDLHOME 25 # this environment variable varies for GS3, where GLI is located in GSDL3SRCHOME (GS3) and not in GSDLHOME (gs2build) 26 if [ "$GSDL3SRCHOME" != "" ] && [ -d $GSDL3SRCHOME ]; then 27 export GSDL_OR_GSDL3SRC_HOME=$GSDL3SRCHOME 28 fi 29 30 export CLASSPATH=$shared_dir:$GSDLHOME/gli:$GSDL_OR_GSDL3SRC_HOME/gli/classes:$GSDLHOME/perllib:$shared_dir/xalan.jar 24 31 25 32 if [ ! -d $output_dir ]; then … … 41 48 42 49 echo "processing top level index" 43 java -DGSDLHOME=$GSDLHOME ApplyXSLT "en" $processing_dir/preprocess-tut-xml.xsl $source_dir/tutorial_en.xml "$@" > $tmp_dir/tutorial_en.xml44 java -DGSDLHOME=$GSDLHOME ApplyXSLT "en" $processing_dir/xml-to-top-index.xsl $tmp_dir/tutorial_en.xml "$@" > $output_dir/index.html50 java -DGSDLHOME=$GSDLHOME -DGSDL3SRCHOME=$GSDL3SRCHOME ApplyXSLT "en" $processing_dir/preprocess-tut-xml.xsl $source_dir/tutorial_en.xml "$@" > $tmp_dir/tutorial_en.xml 51 java -DGSDLHOME=$GSDLHOME -DGSDL3SRCHOME=$GSDL3SRCHOME ApplyXSLT "en" $processing_dir/xml-to-top-index.xsl $tmp_dir/tutorial_en.xml "$@" > $output_dir/index.html 45 52 46 53 echo "generating wiki index page" 47 java -DGSDLHOME=$GSDLHOME ApplyXSLT "en" $processing_dir/xml-to-wiki-index.xsl $tmp_dir/tutorial_en.xml "$@" > $output_dir/wiki-index.txt54 java -DGSDLHOME=$GSDLHOME -DGSDL3SRCHOME=$GSDL3SRCHOME ApplyXSLT "en" $processing_dir/xml-to-wiki-index.xsl $tmp_dir/tutorial_en.xml "$@" > $output_dir/wiki-index.txt 48 55 49 56 for l in $langs; do … … 55 62 56 63 if [ "$l" != "en" ]; then 57 java -DGSDLHOME=$GSDLHOME ApplyXSLT $l $processing_dir/preprocess-tut-xml.xsl $source_dir/tutorial_$l.xml "$@" > $tmp_dir/tutorial_$l.xml64 java -DGSDLHOME=$GSDLHOME -DGSDL3SRCHOME=$GSDL3SRCHOME ApplyXSLT $l $processing_dir/preprocess-tut-xml.xsl $source_dir/tutorial_$l.xml "$@" > $tmp_dir/tutorial_$l.xml 58 65 fi 59 java -DGSDLHOME=$GSDLHOME ApplyXSLT $l $processing_dir/xml-to-index.xsl $tmp_dir/tutorial_$l.xml "$@" > index.html60 java -DGSDLHOME=$GSDLHOME ApplyXSLT $l $processing_dir/xml-to-one-html.xsl $tmp_dir/tutorial_$l.xml "$@" > all_tutorials.html61 java -DGSDLHOME=$GSDLHOME ApplyXSLT $l $processing_dir/xml-to-many-html.xsl $tmp_dir/tutorial_$l.xml "$@" | perl -S $GSDLHOME/gli/help/splithelpdocument.pl66 java -DGSDLHOME=$GSDLHOME -DGSDL3SRCHOME=$GSDL3SRCHOME ApplyXSLT $l $processing_dir/xml-to-index.xsl $tmp_dir/tutorial_$l.xml "$@" > index.html 67 java -DGSDLHOME=$GSDLHOME -DGSDL3SRCHOME=$GSDL3SRCHOME ApplyXSLT $l $processing_dir/xml-to-one-html.xsl $tmp_dir/tutorial_$l.xml "$@" > all_tutorials.html 68 java -DGSDLHOME=$GSDLHOME -DGSDL3SRCHOME=$GSDL3SRCHOME ApplyXSLT $l $processing_dir/xml-to-many-html.xsl $tmp_dir/tutorial_$l.xml "$@" | perl -S $GSDL_OR_GSDL3SRC_HOME/gli/help/splithelpdocument.pl 62 69 cd $top_dir 63 70 done
Note:
See TracChangeset
for help on using the changeset viewer.