IssueZilla 10518 - Install BeanShell UNO package with installer

scripting/workben/build.xml

@@ -3,9 +3,9 @@
 #
 #   $RCSfile: build.xml,v $
 #
-#   $Revision: 1.11 $
+#   $Revision: 1.12 $
 #
-#   last change: $Author: toconnor $ $Date: 2003-01-28 20:49:09 $
+#   last change: $Author: toconnor $ $Date: 2003-01-31 13:53:09 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -244,7 +244,7 @@
     <zip zipfile="${out}/class/sframeworkinstall/sframework/ooscriptframe.zip"
         basedir="${out}/class/sframework">
     </zip>
-    <copy file="${prj}/common/bin/scripting${env.UPD}01.res"
+    <copy file="${prj}/common${proext}/bin/scripting${env.UPD}01.res"
         todir="${out}/class/sframeworkinstall/sframework/"/>
   </target>
 
@@ -256,30 +256,11 @@
     <mkdir dir="${out}/class/bshruntime/skip_registration"/>
     <copy file="${install.dir}/bsh-1.2b7.jar"
         todir="${out}/class/bshruntime/skip_registration"/>
-    <zip zipfile="${out}/class/bshruntime.zip"
+    <zip zipfile="${out}/class/sframeworkinstall/sframework/bshruntime.zip"
         basedir="${out}/class/bshruntime">
     </zip>
   </target>
 
-  <!-- ===================== Package regsingletons ========================= -->
-  <target name="packagesingletons_win7" depends="build.conditions" if="win7.build">
-    <mkdir dir="${out}/class/sframeworkinstall/windows"/>
-    <copy file="${env.SOLARVER}/wntmsci7${proext}/bin${env.UPDMINOREXT}/regsingleton.exe" todir="${out}/class/sframeworkinstall/windows"/>
-  </target>
-  <target name="packagesingletons_win9" depends="build.conditions" if="win9.build">
-    <mkdir dir="${out}/class/sframeworkinstall/windows"/>
-    <copy file="${env.SOLARVER}/wntmsci9${proext}/bin${env.UPDMINOREXT}/regsingleton.exe" todir="${out}/class/sframeworkinstall/windows"/>
-  </target>
-  <target name="packagesingletons_linux" depends="build.conditions" if="linx86.build">
-    <mkdir dir="${out}/class/sframeworkinstall/linux_x86"/>
-    <copy file="${env.SOLARVER}/unxlngi4${proext}/bin${env.UPDMINOREXT}/regsingleton" todir="${out}/class/sframeworkinstall/linux_x86"/>
-  </target>
-  <target name="packagesingletons_solaris" depends="build.conditions" if="solsparc.build">
-    <mkdir dir="${out}/class/sframeworkinstall/solaris_sparc"/>
-    <copy file="rs_solaris/regsingleton" todir="${out}/class/sframeworkinstall/solaris_sparc"/>
-  </target>
-  <target name="packagesingletons" depends="packagesingletons_win7,packagesingletons_win9,packagesingletons_linux,packagesingletons_solaris">
-  </target>
   <!-- ===================== Package scripts, dialogs & examples =========== -->
   <target name="packagedialogsandexamples" depends="buildexamples">
     <mkdir dir="${out}/class/sframeworkinstall/bindingdialog"/>
@@ -293,17 +274,18 @@
         <fileset dir="${out}/class/examples/"/>
     </copy>
   </target>
-  <!-- ===================== Package scripts, dislogs & examples =========== -->
+
+  <!-- ===================== Package IDEs ================================== -->
   <target name="packageide">
     <mkdir dir="${out}/class/sframeworkinstall/ide"/>
     <copy todir="${out}/class/sframeworkinstall/ide">
         <fileset dir="${out}/class/">
-            <include name="OfficeScripting.jar"/>
             <include name="idesupport.jar"/>
             <include name="office.jar"/>
         </fileset>
     </copy>
   </target>
+
   <!-- ======================== Compile Classes ========================== -->
   <target name="compileinstaller">
     <mkdir dir="${installerclasses}"/>
@@ -314,7 +296,7 @@
   </target>
 
   <!-- ===================== jar ========================= -->
-  <target name="jar" depends="compileinstaller,packagedialogsandexamples,packageide,packagesingletons,buildunopackage,buildbshuno">
+  <target name="jar" depends="compileinstaller,packagedialogsandexamples,packageide,buildunopackage,buildbshuno">
     <jar jarfile="${jardir}/${installerjarname}"
          basedir="${installerclasses}">
         <manifest>

scripting/workben/installer/Register.java

@@ -57,52 +57,63 @@ public class Register{
 
     }
     public static boolean register(String path, JLabel statusLabel) {
+        String[] packages = {"ooscriptframe.zip", "bshruntime.zip"};
+
     try {
         String s=null;
         int exitcode=0;
         String env[] = new String[1];
         Runtime rt = Runtime.getRuntime();
+        boolean isWindows =
+                (System.getProperty("os.name").indexOf("Windows") != -1);
 
         String progpath = path.concat("program" + File.separator);
         Process p;
 
             statusLabel.setText("Registering Scripting Framework...");
-        String opSys = System.getProperty("os.name");
 
             // pkgchk Scripting Framework Components
             statusLabel.setText("Registering Scripting Framework Components...");
         System.out.println("Registering Scripting Framework Components...");
 
-        if (opSys.indexOf("Windows") == -1){
-                //System.out.println( "Not Windows");
-        env[0]="LD_LIBRARY_PATH="+progpath;
-
-        p=rt.exec("chmod a+x "+progpath+"pkgchk");
-        exitcode=p.waitFor();
-        if (exitcode ==0){
-                    //scriptnm.zip is an old SF. Works with SO6.1 EA2
-            System.err.println(progpath+"pkgchk "+progpath+"ooscriptframe.zip");
-                    p=rt.exec(progpath+"pkgchk "+progpath+"ooscriptframe.zip", env);
-                    //p=rt.exec(progpath+"pkgchk "+progpath+"scriptnm.zip" );
+            for (int i = 0; i < packages.length; i++) {
+                String cmd = "";
+
+            if (!isWindows) {
+            env[0]="LD_LIBRARY_PATH=" + progpath;
+
+            p = rt.exec("chmod a+x " + progpath + "pkgchk");
+            exitcode = p.waitFor();
+
+            if (exitcode == 0){
+                        cmd = progpath + "pkgchk " + progpath + packages[i];
+
+                System.err.println(cmd);
+                        p=rt.exec(cmd, env);
+                    }
                 }
+            else {
+                    cmd = "\"" + progpath + "pkgchk.exe\" \"" + progpath +
+                        packages[i] + "\"";
+
+            System.err.println(cmd);
+                    p=rt.exec(cmd);
             }
-        else {
-        //progpath = "C:\\Progra~1\\OpenOffice.org643\\program\\";
-                //System.out.println( "Windows" );
-        //String pkgStr = new String("\""+progpath+"pkgchk.exe\" \""+progpath+"ooscriptframe.zip\"\"");
-        System.err.println("\""+progpath+"pkgchk.exe\" \""+progpath+"ooscriptframe.zip\"");
-                p=rt.exec("\""+progpath+"pkgchk.exe\" \""+progpath+"ooscriptframe.zip\"");
-        }
-            exitcode=p.waitFor();
-            if (exitcode !=0) {
-        if(opSys.indexOf("Windows") == -1){
-            System.out.println("\nPkgChk Failed \nCommand: " +progpath+"pkgchk "+progpath+"ooscriptframe.zip"+ "\n"+ env[0]);
-        }
-        else {
-            System.out.println("\nPkgChk Failed \nCommand: \""+progpath+"pkgchk.exe\" \""+progpath+"ooscriptframe.zip\"");
-        }
-        statusLabel.setText("PkgChk Failed, please view SFrameworkInstall.log");
-        return false;
+
+                exitcode = p.waitFor();
+                if (exitcode != 0) {
+                    System.err.println("\nPkgChk Failed");
+
+            if(!isWindows)
+                System.err.println("Command: " + cmd + "\n" + env[0]);
+            else
+            System.err.println("Command: \"" + cmd + "\"");
+
+            statusLabel.setText(
+                        "PkgChk Failed, please view SFrameworkInstall.log");
+
+            return false;
+                }
         }
 
             // if ( !regSingletons( path, progpath, opSys, statusLabel ) )

scripting/workben/installer/XmlUpdater.java

@@ -184,6 +184,13 @@ public class XmlUpdater extends Thread {
             return;
     }
 
+        if (!zd.extractEntry("sframework/bshruntime.zip",progpath, statusLabel))
+        {
+            onInstallComplete();
+            return;
+    }
+
+    // Check for OpenOffice Scxripting Security Resource
     // Check for OpenOffice Scxripting Security Resource
         if (!zd.extractEntry("sframework/scripting64301.res",progpath+"resource"+File.separator, statusLabel))
         {
@@ -195,28 +202,6 @@ public class XmlUpdater extends Thread {
         }
     }
 
-    if (opSys.indexOf("Windows")!=-1){
-            if (!zd.extractEntry("windows/regsingleton.exe",progpath, statusLabel))
-            {
-                onInstallComplete();
-                return;
-            }
-        }
-        else if (opSys.indexOf("Linux")!=-1){
-            if (!zd.extractEntry("linux_x86/regsingleton",progpath, statusLabel))
-            {
-                onInstallComplete();
-                return;
-            }
-        }
-        else if (opSys.indexOf("SunOS")!=-1){
-            if (!zd.extractEntry("solaris_sparc/regsingleton",progpath, statusLabel))
-            {
-                onInstallComplete();
-                return;
-            }
-        }
-
 //--------------------------------
 // Robert Kinsella test 2