View | Details | Raw Unified | Return to issue 39534
Collapse All | Expand All

(-)./cfgWin.js (-85 / +39 lines)
Lines 23-46 Link Here
23
23
24
var oo_sdk_name = WshSysEnv("OO_SDK_NAME");
24
var oo_sdk_name = WshSysEnv("OO_SDK_NAME");
25
var oo_sdk_home = getSdkHome();
25
var oo_sdk_home = getSdkHome();
26
var office_or_ure = getOfficeOrUre();
26
var office_home = getOfficeHome();
27
var office_home = "";
28
var oo_sdk_ure_home = "";
29
if (office_or_ure == "office") {
30
    office_home = getOfficeHome();
31
} else {
32
    oo_sdk_ure_home = getUreHome();
33
}
34
var oo_sdk_make_home = getMakeHome();
27
var oo_sdk_make_home = getMakeHome();
35
var oo_sdk_zip_home = getZipHome();
28
var oo_sdk_zip_home = getZipHome();
36
var oo_sdk_cpp_home = getCppHome();
29
var oo_sdk_cpp_home = getCppHome();
37
var oo_sdk_cli_home = getCliHome();
30
var oo_sdk_cli_home = getCliHome();
38
var oo_sdk_java_home = getJavaHome();
31
var oo_sdk_java_home = getJavaHome();
39
var oo_sdk_output_dir = getOutputDir();
32
var oo_sdk_output_dir = getOutputDir();
40
var sdk_auto_deployment = "NO";
33
var sdk_auto_deployment = getAutoDeployment();
41
if (office_or_ure == "office") {
34
//Extend the path to the office program dir and the bin dir of the SDK
42
    sdk_auto_deployment = getAutoDeployment();
35
WshSysEnv("PATH") = office_home + "\\program;" + oo_sdk_home + "\\windows\\bin;"
43
}
36
        + WshSysEnv("PATH");
37
38
var uno_java_jfw_jrehome = makeBootstrapFileUrl(oo_sdk_java_home);
39
var uno_java_jfw_vendor_settings = makeBootstrapFileUrl(office_home + "\\share\\config\\javavendors.xml");
44
40
45
writeBatFile(oo_sdk_home + "\\setsdkenv_windows.bat");
41
writeBatFile(oo_sdk_home + "\\setsdkenv_windows.bat");
46
42
Lines 110-132 Link Here
110
    }   
106
    }   
111
}
107
}
112
108
113
function getOfficeOrUre()
114
{
115
    var suggestion = "Office";
116
    var choice;
117
    while (choice != "office" && choice != "ure") {
118
        stdout.Write(
119
            "\n Use an installed Office or an installed UNO Runtime"
120
            + " Environment (Office/URE) [" + suggestion + "]:");
121
        choice = stdin.ReadLine();
122
        if (choice == "") {
123
            choice = suggestion;
124
        }
125
        choice = choice.toLowerCase();
126
    }
127
    return choice;
128
}
129
130
function getOfficeHome()
109
function getOfficeHome()
131
{
110
{
132
    var sSuggestedHome = WshSysEnv("OFFICE_HOME");
111
    var sSuggestedHome = WshSysEnv("OFFICE_HOME");
Lines 195-219 Link Here
195
    }
174
    }
196
}
175
}
197
176
198
function getUreHome()
199
{
200
    var suggestion = WshSysEnv("OO_SDK_URE_HOME");
201
    var choice;
202
    for (;;) {
203
        stdout.Write(
204
            "\n Enter the URE installation directory [" + suggestion + "]:");
205
        choice = stdin.ReadLine();
206
        if (choice == "") {
207
            choice = suggestion;
208
        }
209
        if (aFileSystemObject.FileExists(choice + "\\bin\\uno.exe")) {
210
            break;
211
        }
212
        stdout.WriteLine("\n Error: A valid URE installation is required.");
213
    }
214
    return choice;
215
}
216
217
function getMakeHome()
177
function getMakeHome()
218
{
178
{
219
    var sSuggestedHome = WshSysEnv("OO_SDK_MAKE_HOME");
179
    var sSuggestedHome = WshSysEnv("OO_SDK_MAKE_HOME");
Lines 552-558 Link Here
552
{
512
{
553
//    var sSuggestedDir = WshSysEnv("OO_SDK_OUTPUT_DIR");
513
//    var sSuggestedDir = WshSysEnv("OO_SDK_OUTPUT_DIR");
554
    var sSuggestedDir = "";
514
    var sSuggestedDir = "";
555
    var bSkip = false;       
515
    var bSkip = false;
556
    while(true)
516
    while(true)
557
    {
517
    {
558
        stdout.Write("\n Default output directory is the SDK directory itself.\n" +
518
        stdout.Write("\n Default output directory is the SDK directory itself.\n" +
Lines 655-660 Link Here
655
function writeBatFile(file)
615
function writeBatFile(file)
656
{
616
{
657
    var fso = new ActiveXObject("Scripting.FileSystemObject");
617
    var fso = new ActiveXObject("Scripting.FileSystemObject");
618
    
619
    // i#39534
620
    var shownOutputDir = "";
621
    if (oo_sdk_output_dir.length == 0)
622
       shownOutputDir = oo_sdk_home + "\\WINexample.out";
623
    else
624
        shownOutputDir = oo_sdk_output_dir;
625
658
    var newFile = fso.CreateTextFile(file, true);
626
    var newFile = fso.CreateTextFile(file, true);
659
    newFile.Write(
627
    newFile.Write(
660
        "@echo off\n" +
628
        "@echo off\n" +
Lines 672-681 Link Here
672
        "REM Example: set OFFICE_HOME=C:\\Programme\\StarOffice\n" +
640
        "REM Example: set OFFICE_HOME=C:\\Programme\\StarOffice\n" +
673
        "set OFFICE_HOME=" + office_home +
641
        "set OFFICE_HOME=" + office_home +
674
        "\n\n" +
642
        "\n\n" +
675
        "REM URE installation directory.\n" +
676
        "REM Example: set OO_SDK_URE_HOME=C:\\Programme\\URE\n" +
677
        "set OO_SDK_URE_HOME=" + oo_sdk_ure_home +
678
        "\n\n" +
679
        "REM Directory of the make command.\n" +
643
        "REM Directory of the make command.\n" +
680
        "REM Example: set OO_SDK_MAKE_HOME=D:\\NextGenerationMake\\make\n" + 
644
        "REM Example: set OO_SDK_MAKE_HOME=D:\\NextGenerationMake\\make\n" + 
681
        "set OO_SDK_MAKE_HOME=" + oo_sdk_make_home + 
645
        "set OO_SDK_MAKE_HOME=" + oo_sdk_make_home + 
Lines 704-709 Link Here
704
        "REM Example: set SDK_AUTO_DEPLOYMENT=YES\n" +
668
        "REM Example: set SDK_AUTO_DEPLOYMENT=YES\n" +
705
        "set SDK_AUTO_DEPLOYMENT=" + sdk_auto_deployment +
669
        "set SDK_AUTO_DEPLOYMENT=" + sdk_auto_deployment +
706
        "\n\n" +
670
        "\n\n" +
671
//        "REM bootstrap variable, needed by the java framework\n" + 
672
//        "REM Example: set UNO_JAVA_JFW_JREHOME=file:///d:/java/jdk1.5\n" + 
673
//        "set UNO_JAVA_JFW_JREHOME=" + uno_java_jfw_jrehome +
674
//        "\n\n" +
675
//        "REM bootstrap variable, needed by the java framework\n" + 
676
//        "REM Example: set UNO_JAVA_JFW_ENV_CLASSPATH=true\n" + 
677
//        "set UNO_JAVA_JFW_ENV_CLASSPATH=true\n" +
678
//        "\n" +
679
//        "REM bootstrap variable, needed by the java framework\n" + 
680
//        "REM Example: set UNO_JAVA_JFW_VENDOR_SETTINGS=file:///c:/program files/StarOffice%%208/share/config/javavendors.xml\n" + 
681
//        "set UNO_JAVA_JFW_VENDOR_SETTINGS=" + uno_java_jfw_vendor_settings +  
682
//        "\n\n" +
707
        "REM Check installation path for the StarOffice Development Kit.\n" +
683
        "REM Check installation path for the StarOffice Development Kit.\n" +
708
        "if not defined OO_SDK_HOME (\n" +
684
        "if not defined OO_SDK_HOME (\n" +
709
        "   echo Error: the variable OO_SDK_HOME is missing!\n" +
685
        "   echo Error: the variable OO_SDK_HOME is missing!\n" +
Lines 712-723 Link Here
712
        "\n" + 
688
        "\n" + 
713
        "REM Check installation path for the office.\n" + 
689
        "REM Check installation path for the office.\n" + 
714
        "if not defined OFFICE_HOME (\n" + 
690
        "if not defined OFFICE_HOME (\n" + 
715
        "if not defined OO_SDK_URE_HOME (\n" + 
691
        "   echo Error: the variable OFFICE_HOME is missing!\n" + 
716
        "   echo Error: either of the variables OFFICE_HOME and\n" +
717
        "   echo OO_SDK_URE_HOME is missing!\n" + 
718
        "   goto :error\n" + 
692
        "   goto :error\n" + 
719
        " )\n" +
693
        " )\n" +
720
        " )\n" +
721
        "\n" +
694
        "\n" +
722
        "REM Check installation path for GNU make.\n" + 
695
        "REM Check installation path for GNU make.\n" + 
723
        "if not defined OO_SDK_MAKE_HOME (\n" + 
696
        "if not defined OO_SDK_MAKE_HOME (\n" + 
Lines 735-775 Link Here
735
        "set LIB=%OO_SDK_HOME%\\windows\\lib;%OO_SDK_HOME%\\WINexample.out\\lib;%LIB%\n" +
708
        "set LIB=%OO_SDK_HOME%\\windows\\lib;%OO_SDK_HOME%\\WINexample.out\\lib;%LIB%\n" +
736
        "\n" +
709
        "\n" +
737
        "REM Set office program path.\n" +
710
        "REM Set office program path.\n" +
738
        "if defined OFFICE_HOME (\n" +
711
        "set OFFICE_PROGRAM_PATH=%OFFICE_HOME%\\program\n" +
739
        "   set OFFICE_PROGRAM_PATH=%OFFICE_HOME%\\program\n" +
740
        " )\n" +
741
        "\n" +
712
        "\n" +
742
	"REM Set UNO path, necessary to ensure that the cpp examples using the\n" +
713
	"REM Set UNO path, necessary to ensure that the cpp examples using the\n" +
743
	"REM new UNO bootstrap mechanism use the configured office installation\n" +
714
	"REM new UNO bootstrap mechanism use the configured office installation.\n" +
744
    "REM (only set when using an Office).\n" +
715
	"set UNO_PATH=%OFFICE_PROGRAM_PATH%\n" +
745
    "if defined OFFICE_HOME (\n" +
746
	"   set UNO_PATH=%OFFICE_PROGRAM_PATH%\n" +
747
    " )\n" +
748
        "\n" +
749
        "if defined OO_SDK_URE_HOME (\n" +
750
        "   set OO_SDK_URE_BIN_DIR=%OO_SDK_URE_HOME%\\bin\n" +
751
        "   set OO_SDK_URE_LIB_DIR=%OO_SDK_URE_HOME%\\bin\n" +
752
        "   set OO_SDK_URE_JAVA_DIR=%OO_SDK_URE_HOME%\\java\n" +
753
        " ) else (\n" +
754
        "   set OO_SDK_URE_BIN_DIR=%OFFICE_PROGRAM_PATH%\n" +
755
        "   set OO_SDK_URE_LIB_DIR=%OFFICE_PROGRAM_PATH%\n" +
756
        "   set OO_SDK_URE_JAVA_DIR=%OFFICE_PROGRAM_PATH%\\classes\n" +
757
        " )\n" +
758
        "\n" +
716
        "\n" +
759
        "REM Set classpath\n" +
717
        "REM Set classpath\n" +
760
        "set CLASSPATH=%OO_SDK_URE_JAVA_DIR%\\juh.jar;%OO_SDK_URE_JAVA_DIR%\\jurt.jar;%OO_SDK_URE_JAVA_DIR%\\ridl.jar;%OO_SDK_URE_JAVA_DIR%\\unoloader.jar\n" +
718
        "set CLASSPATH=%OFFICE_PROGRAM_PATH%\\classes\\java_uno.jar;%OFFICE_PROGRAM_PATH%\\classes\\jurt.jar;%OFFICE_PROGRAM_PATH%\\classes\\unoil.jar;%OFFICE_PROGRAM_PATH%\\classes\\ridl.jar;%OFFICE_PROGRAM_PATH%\\classes\\sandbox.jar;%OFFICE_PROGRAM_PATH%\\classes\\juh.jar\n" +
761
        "if defined OFFICE_HOME (\n" +
762
        "    set CLASSPATH=%CLASSPATH%;%OO_SDK_URE_JAVA_DIR%\\unoil.jar\n" +
763
        " )\n" +
764
        "\n" +
719
        "\n" +
765
        "REM Add directory of the SDK tools to the path.\n" +
720
        "REM Add directory of the SDK tools to the path.\n" +
766
        "set PATH=%OO_SDK_HOME%\\windows\\bin;%OO_SDK_URE_BIN_DIR%;%OO_SDK_HOME%\\WINexample.out\\bin;%PATH%\n" +
721
        "set PATH=%OO_SDK_HOME%\\windows\\bin;%OFFICE_HOME%\\program;%OO_SDK_HOME%\\WINexample.out\\bin;%PATH%\n" +
767
        "\n" +
722
        "\n" +
768
        "REM Set PATH appropriate to the output directory\n" +
723
        "REM Set PATH appropriate to the output directory\n" +
769
        "if defined OO_SDK_OUTPUT_DIR (\n" + 
724
        "if defined OO_SDK_OUTPUT_DIR (\n" + 
770
        "   set PATH=%OO_SDK_OUTPUT_DIR%\\%OO_SDK_NAME%\\WINexample.out\\bin;%PATH%\n" + 
725
        "   set PATH=%OO_SDK_OUTPUT_DIR%\\%OO_SDK_NAME%\\WINexample.out\\bin;%PATH%\n" +
771
        " ) else (\n" + 
726
        " ) else (\n" +
772
        "   set PATH=%OO_SDK_HOME%\\WINexample.out\\bin;%PATH%\n" + 
727
        "   set PATH=%OO_SDK_HOME%\\WINexample.out\\bin;%PATH%\n" +
773
        " )\n" + 
728
        " )\n" + 
774
        "\n" +
729
        "\n" +
775
        "REM Add directory of the command make to the path, if necessary.\n" +
730
        "REM Add directory of the command make to the path, if necessary.\n" +
Lines 800-812 Link Here
800
        "echo  *\n" +       
755
        "echo  *\n" +       
801
        "echo  * SDK = %OO_SDK_HOME%\n" +
756
        "echo  * SDK = %OO_SDK_HOME%\n" +
802
        "echo  * Office = %OFFICE_HOME%\n" +
757
        "echo  * Office = %OFFICE_HOME%\n" +
803
        "echo  * URE = %OO_SDK_URE_HOME%\n" +
804
        "echo  * Make = %OO_SDK_MAKE_HOME%\n" +
758
        "echo  * Make = %OO_SDK_MAKE_HOME%\n" +
805
        "echo  * Zip = %OO_SDK_ZIP_HOME%\n" +
759
        "echo  * Zip = %OO_SDK_ZIP_HOME%\n" +
806
        "echo  * C++ Compiler = %OO_SDK_CPP_HOME%\n" +
760
        "echo  * C++ Compiler = %OO_SDK_CPP_HOME%\n" +
807
        "echo  * C# and VB.NET compilers = %OO_SDK_CLI_HOME%\n" +
761
        "echo  * C# and VB.NET compilers = %OO_SDK_CLI_HOME%\n" +
808
        "echo  * Java = %OO_SDK_JAVA_HOME%\n" +
762
        "echo  * Java = %OO_SDK_JAVA_HOME%\n" +
809
        "echo  * Special Output directory = %OO_SDK_OUTPUT_DIR%\n" +
763
        "echo  * Output directory = " + shownOutputDir + "\n" +
810
        "echo  * Auto deployment = %SDK_AUTO_DEPLOYMENT%\n" +
764
        "echo  * Auto deployment = %SDK_AUTO_DEPLOYMENT%\n" +
811
        "echo  *\n" +
765
        "echo  *\n" +
812
        "echo  ************************************************************************\n" +
766
        "echo  ************************************************************************\n" +

Return to issue 39534