[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 4 commits - desktop/scripts desktop/win32 odk/cfgWin.js odk/examples odk/setsdkenv_windows.template odk/settings odk/util padmin/source pyuno/zipcore scp2/source setup_native/source
Jürgen Schmidt
jsc at apache.org
Fri Jun 7 07:07:40 PDT 2013
desktop/scripts/unoinfo.sh | 10
desktop/scripts/unopkg.sh | 2
desktop/win32/source/unoinfo.cxx | 45 --
odk/cfgWin.js | 206 ++++------
odk/examples/cpp/complextoolbarcontrols/Makefile | 4
odk/setsdkenv_windows.template | 153 ++-----
odk/settings/settings.mk | 26 -
odk/util/makefile.pmk | 6
padmin/source/spadmin.sh | 10
pyuno/zipcore/python.sh | 8
scp2/source/winexplorerext/registryitem_winexplorerext.scp | 24 -
setup_native/source/win32/customactions/patch/swappatchfiles.cxx | 9
12 files changed, 195 insertions(+), 308 deletions(-)
New commits:
commit c227c27ed654fa8fa38afe04432f5cc676af2bfb
Author: Jürgen Schmidt <jsc at apache.org>
Date: Fri Jun 7 12:55:00 2013 +0000
#122482# remove STLPORT macro from seetings.mk, add msvcprt.lib
diff --git a/odk/examples/cpp/complextoolbarcontrols/Makefile b/odk/examples/cpp/complextoolbarcontrols/Makefile
index 53ecfaa..cddaf23 100644
--- a/odk/examples/cpp/complextoolbarcontrols/Makefile
+++ b/odk/examples/cpp/complextoolbarcontrols/Makefile
@@ -79,14 +79,14 @@ $(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(SLOFILES)
-$(MKDIR) $(subst /,$(PS),$(OUT_COMP_GEN))
$(LINK) $(COMP_LINK_FLAGS) /OUT:$@ \
/MAP:$(OUT_COMP_GEN)/$(subst $(SHAREDLIB_EXT),map,$(@F)) $(SLOFILES) \
- $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) $(STLPORTLIB) msvcrt.lib kernel32.lib
+ $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) msvcrt.lib msvcprt.lib kernel32.lib
$(LINK_MANIFEST)
else
#$(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(SLOFILES) $(COMP_MAPFILE)
$(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(SLOFILES)
-$(MKDIR) $(subst /,$(PS),$(@D))
$(LINK) $(COMP_LINK_FLAGS) $(LINK_LIBS) -o $@ $(SLOFILES) \
- $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) $(STLPORTLIB) $(STC++LIB) $(CPPUHELPERDYLIB) $(CPPUDYLIB) $(SALDYLIB)
+ $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) $(STC++LIB) $(CPPUHELPERDYLIB) $(CPPUDYLIB) $(SALDYLIB)
ifeq "$(OS)" "MACOSX"
$(INSTALL_NAME_URELIBS) $@
endif
diff --git a/odk/settings/settings.mk b/odk/settings/settings.mk
index 8917052..223ed21 100644
--- a/odk/settings/settings.mk
+++ b/odk/settings/settings.mk
@@ -93,7 +93,6 @@ CPPUHELPERLIB=icppuhelper.lib
SALHELPERLIB=isalhelper.lib
REGLIB=ireg.lib
STORELIB=istore.lib
-STLPORTLIB=stlport_vc71$(STLDEBUG).lib
BLANK=
EMPTYSTRING=
@@ -127,7 +126,7 @@ CC_OUTPUT_SWITCH=-Fo
LIBRARY_LINK_FLAGS=/NODEFAULTLIB /DLL /DEBUGTYPE:cv
COMP_LINK_FLAGS=$(LIBRARY_LINK_FLAGS) /DEF:$(PRJ)/settings/component.uno.def
-EXE_LINK_FLAGS=/MAP /OPT:NOREF /SUBSYSTEM:CONSOLE /BASE:0x1b000000 /DEBUGTYPE:cv /NODEFAULTLIB msvcrt.lib kernel32.lib
+EXE_LINK_FLAGS=/MAP /OPT:NOREF /SUBSYSTEM:CONSOLE /BASE:0x1b000000 /DEBUGTYPE:cv /NODEFAULTLIB msvcrt.lib msvcprt.lib kernel32.lib
ifeq "$(DEBUG)" "yes"
LIBRARY_LINK_FLAGS+=/DEBUG
EXE_LINK_FLAGS+=/DEBUG
@@ -211,11 +210,6 @@ CPPUHELPERLIB=-luno_cppuhelperC52
SALHELPERLIB=-luno_salhelperC52
REGLIB=-lreg
STORELIB=-lstore
-ifeq "$(PROCTYPE)" "sparc64"
-STLPORTLIB=-library=stlport4
-else
-STLPORTLIB=-lstlport_sunpro$(STLDEBUG)
-endif
EMPTYSTRING=
PATH_SEPARATOR=:
@@ -277,27 +271,23 @@ PLATFORM=linux
PACKAGE_LIB_DIR=linux_$(PROCTYPE).plt
UNOPKG_PLATFORM=Linux_$(PROCTYPE)
JAVA_PROC_TYPE=$(PROCTYPE)
-STLPORT=no
ifeq "$(PROCTYPE)" "i386"
PACKAGE_LIB_DIR=linux_x86.plt
UNOPKG_PLATFORM=Linux_x86
JAVA_PROC_TYPE=i386
-STLPORT=yes
endif
ifeq "$(PROCTYPE)" "powerpc"
PACKAGE_LIB_DIR=linux_powerpc.plt
UNOPKG_PLATFORM=Linux_PowerPC
JAVA_PROC_TYPE=ppc
-STLPORT=yes
endif
ifeq "$(PROCTYPE)" "sparc"
PACKAGE_LIB_DIR=linux_sparc.plt
UNOPKG_PLATFORM=Linux_SPARC
JAVA_PROC_TYPE=sparc
-STLPORT=yes
endif
ifeq "$(PROCTYPE)" "x86_64"
@@ -349,15 +339,6 @@ CPPUHELPERLIB=-luno_cppuhelper$(COMID)
SALHELPERLIB=-luno_salhelper$(COMID)
REGLIB=-lreg
STORELIB=-lstore
-ifeq "$(STLPORT)" "yes"
-ifeq "$(STLPORT_VER)" "500"
-STLPORTLIB=-lstlport
-else
-STLPORTLIB=-lstlport_gcc$(STLDEBUG)
-endif
-else
-STLPORTLIB=
-endif
EMPTYSTRING=
PATH_SEPARATOR=:
@@ -615,11 +596,6 @@ CPPUHELPERLIB=-luno_cppuhelper$(COMID)
SALHELPERLIB=-luno_salhelper$(COMID)
REGLIB=-lreg
STORELIB=-lstore
-ifeq "$(STLPORT_VER)" "500"
-STLPORTLIB=-lstlport
-else
-STLPORTLIB=-lstlport_gcc$(STLDEBUG)
-endif
EMPTYSTRING=
PATH_SEPARATOR=:
diff --git a/odk/util/makefile.pmk b/odk/util/makefile.pmk
index 3e2cdd9..f57fce6 100644
--- a/odk/util/makefile.pmk
+++ b/odk/util/makefile.pmk
@@ -24,7 +24,11 @@
# used for sdk common files
PRODUCT_RELEASE=4.0
OFFICENAME=OpenOffice
+.IF "$(GUI)"=="WNT"
+SDKDIRNAME=OpenOffice_$(PRODUCT_RELEASE)_SDK
+.ELSE
SDKDIRNAME=openoffice$(PRODUCT_RELEASE)_sdk
+.ENDIF
OFFICEPRODUCTNAME=$(OFFICENAME) $(PRODUCT_RELEASE)
TITLE=$(OFFICENAME) $(PRODUCT_RELEASE) SDK
IDLDOCREFNAME="$(OFFICENAME) $(PRODUCT_RELEASE) API"
@@ -189,6 +193,8 @@ INCLUDETOPDIRLIST= \
.IF "$(GUI)"=="WNT"
INCLUDETOPDIRLIST += $(INCOUT)/systools
+.ELSE
+INCLUDETOPDIRLIST += $(INCOUT)/boost
.ENDIF
INCLUDEDIRLIST:={$(subst,/,/ $(shell @$(FIND) $(INCLUDETOPDIRLIST) -type d -print))}
commit 25d6618a9725d6bdba64ae4d46e32eb024b747fc
Author: Jürgen Schmidt <jsc at apache.org>
Date: Fri Jun 7 12:28:39 2013 +0000
#122478# further cleanup for 3layer changes
diff --git a/padmin/source/spadmin.sh b/padmin/source/spadmin.sh
index dc5919ef..be40822 100644
--- a/padmin/source/spadmin.sh
+++ b/padmin/source/spadmin.sh
@@ -47,17 +47,15 @@ do
done
# extend the ld_library_path for java: javaldx checks the sofficerc for us
-if [ -x "$sd_prog/../basis-link/ure-link/bin/javaldx" ] ; then
+if [ -x "$sd_prog/javaldx" ] ; then
# this is a temporary hack until we can live with the default search paths
case "`uname -s`" in
FreeBSD)
- sd_prog1="$sd_prog/../basis-link/program"
- sd_prog2="$sd_prog/../basis-link/ure-link/lib"
- LD_LIBRARY_PATH=$sd_prog1:$sd_prog2${LD_LIBRARY_PATH+:${LD_LIBRARY_PATH}}
+ LD_LIBRARY_PATH=$sd_prog:${LD_LIBRARY_PATH+:${LD_LIBRARY_PATH}}
export LD_LIBRARY_PATH
;;
esac
- my_path=`"$sd_prog/../basis-link/ure-link/bin/javaldx" $BOOTSTRAPVARS \
+ my_path=`"$sd_prog/javaldx" $BOOTSTRAPVARS \
"-env:INIFILENAME=vnd.sun.star.pathname:$sd_prog/redirectrc"`
if [ -n "$my_path" ] ; then
LD_LIBRARY_PATH=$my_path${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
@@ -75,5 +73,5 @@ PATH=$sd_prog${PATH+:$PATH}
export PATH
# execute binary
-exec "$sd_prog/../basis-link/program/spadmin.bin" "$@" \
+exec "$sd_prog/spadmin.bin" "$@" \
"-env:INIFILENAME=vnd.sun.star.pathname:$sd_prog/redirectrc"
diff --git a/pyuno/zipcore/python.sh b/pyuno/zipcore/python.sh
index 726f6be..bf4f9f6 100644
--- a/pyuno/zipcore/python.sh
+++ b/pyuno/zipcore/python.sh
@@ -38,7 +38,7 @@ PATH=$sd_prog${PATH+:$PATH}
export PATH
# Set LD_LIBRARY_PATH so that "import pyuno" finds libpyuno.so:
-LD_LIBRARY_PATH=$sd_prog/../basis-link/program:$sd_prog/../basis-link/ure-link/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
+LD_LIBRARY_PATH=$sd_prog:${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
export LD_LIBRARY_PATH
# Set UNO_PATH so that "officehelper.bootstrap()" can find soffice executable:
@@ -50,10 +50,10 @@ export UNO_PATH
: ${URE_BOOTSTRAP=vnd.sun.star.pathname:$sd_prog/fundamentalrc}
export URE_BOOTSTRAP
-PYTHONPATH=$sd_prog/../basis-link/program:$sd_prog/../basis-link/program/python-core-%%PYVERSION%%/lib:$sd_prog/../basis-link/program/python-core-%%PYVERSION%%/lib/lib-dynload:$sd_prog/../basis-link/program/python-core-%%PYVERSION%%/lib/lib-tk:$sd_prog/../basis-link/program/python-core-%%PYVERSION%%/lib/site-packages${PYTHONPATH+:$PYTHONPATH}
+PYTHONPATH=$sd_prog:$sd_prog/python-core-%%PYVERSION%%/lib:$sd_prog/python-core-%%PYVERSION%%/lib/lib-dynload:$sd_prog/python-core-%%PYVERSION%%/lib/lib-tk:$sd_prog/python-core-%%PYVERSION%%/lib/site-packages${PYTHONPATH+:$PYTHONPATH}
export PYTHONPATH
-PYTHONHOME=$sd_prog/../basis-link/program/python-core-%%PYVERSION%%
+PYTHONHOME=$sd_prog/python-core-%%PYVERSION%%
export PYTHONHOME
# execute binary
-exec "$sd_prog/../basis-link/program/python.bin" "$@"
+exec "$sd_prog/python.bin" "$@"
diff --git a/scp2/source/winexplorerext/registryitem_winexplorerext.scp b/scp2/source/winexplorerext/registryitem_winexplorerext.scp
index b5ac0d4..01a8547 100644
--- a/scp2/source/winexplorerext/registryitem_winexplorerext.scp
+++ b/scp2/source/winexplorerext/registryitem_winexplorerext.scp
@@ -31,8 +31,8 @@ RegistryItem gid_Regitem_Clsid_087B3AE3_E237_4467_B8DB_5A38AB959AC9_InProcServer
ModuleID = gid_Module_Optional_Winexplorerext;
Styles = (X64);
Subkey = "CLSID\{087B3AE3-E237-4467-B8DB-5A38AB959AC9}\InprocServer32";
- Value = "[INSTALLLOCATION]Basis\program\shlxthdl\shlxthdl.dll";
- Val64 = "[INSTALLLOCATION]Basis\program\shlxthdl\shlxthdl_x64.dll";
+ Value = "[INSTALLLOCATION]program\shlxthdl\shlxthdl.dll";
+ Val64 = "[INSTALLLOCATION]program\shlxthdl\shlxthdl_x64.dll";
End
RegistryItem gid_Regitem_Clsid_087B3AE3_E237_4467_B8DB_5A38AB959AC9_InProcServer32_ThreadingModel
@@ -54,8 +54,8 @@ RegistryItem gid_Regitem_Clsid_3B092F0C_7696_40E3_A80F_68D74DA84210_InProcServer
ModuleID = gid_Module_Optional_Winexplorerext;
Styles = (X64);
Subkey = "CLSID\{3B092F0C-7696-40E3-A80F-68D74DA84210}\InprocServer32";
- Value = "[INSTALLLOCATION]Basis\program\shlxthdl\shlxthdl.dll";
- Val64 = "[INSTALLLOCATION]Basis\program\shlxthdl\shlxthdl_x64.dll";
+ Value = "[INSTALLLOCATION]program\shlxthdl\shlxthdl.dll";
+ Val64 = "[INSTALLLOCATION]program\shlxthdl\shlxthdl_x64.dll";
End
RegistryItem gid_Regitem_Clsid_3B092F0C_7696_40E3_A80F_68D74DA84210_InProcServer32_ThreadingModel
@@ -86,8 +86,8 @@ RegistryItem gid_Regitem_Clsid_C52AF81D_F7A0_4AAB_8E87_F80A60CCD396_InProcServer
ModuleID = gid_Module_Optional_Winexplorerext;
Styles = (X64);
Subkey = "CLSID\{C52AF81D-F7A0-4AAB-8E87-F80A60CCD396}\InprocServer32";
- Value = "[INSTALLLOCATION]Basis\program\shlxthdl\shlxthdl.dll";
- Val64 = "[INSTALLLOCATION]Basis\program\shlxthdl\shlxthdl_x64.dll";
+ Value = "[INSTALLLOCATION]program\shlxthdl\shlxthdl.dll";
+ Val64 = "[INSTALLLOCATION]program\shlxthdl\shlxthdl_x64.dll";
End
RegistryItem gid_Regitem_Clsid_C52AF81D_F7A0_4AAB_8E87_F80A60CCD396_InProcServer32_ThreadingModel
@@ -118,8 +118,8 @@ RegistryItem gid_Regitem_Clsid_7BC0E710_5703_45BE_A29D_5D46D8B39262_InProcServer
ModuleID = gid_Module_Root;
Subkey = "CLSID\{7BC0E710-5703-45BE-A29D-5D46D8B39262}\InprocServer32";
Styles = (X64); // Values: X64 / X64_ONLY
- Value = "[INSTALLLOCATION]Basis\program\shlxthdl\ooofilt.dll";
- Val64 = "[INSTALLLOCATION]Basis\program\shlxthdl\ooofilt_x64.dll";
+ Value = "[INSTALLLOCATION]program\shlxthdl\ooofilt.dll";
+ Val64 = "[INSTALLLOCATION]program\shlxthdl\ooofilt_x64.dll";
End
RegistryItem gid_Regitem_Clsid_7BC0E710_5703_45BE_A29D_5D46D8B39262_InProcServer32_ThreadingModel
@@ -159,8 +159,8 @@ RegistryItem gid_Regitem_Clsid_63542C48_9552_494A_84F7_73AA6A7C99C1_InProcServer
ModuleID = gid_Module_Optional_Winexplorerext;
Styles = (X64);
Subkey = "CLSID\{63542C48-9552-494A-84F7-73AA6A7C99C1}\InprocServer32";
- Value = "[INSTALLLOCATION]Basis\program\shlxthdl\shlxthdl.dll";
- Val64 = "[INSTALLLOCATION]Basis\program\shlxthdl\shlxthdl_x64.dll";
+ Value = "[INSTALLLOCATION]program\shlxthdl\shlxthdl.dll";
+ Val64 = "[INSTALLLOCATION]program\shlxthdl\shlxthdl_x64.dll";
End
RegistryItem gid_Regitem_Clsid_63542C48_9552_494A_84F7_73AA6A7C99C1_InProcServer32_ThreadingModel
@@ -193,8 +193,8 @@ RegistryItem gid_Regitem_Clsid_AE424E85_F6DF_4910_A6A9_438797986431_InProcServer
ComponentCondition = "VersionNT >= 600";
Styles = (X64);
Subkey = "CLSID\{AE424E85-F6DF-4910-A6A9-438797986431}\InprocServer32";
- Value = "[INSTALLLOCATION]Basis\program\shlxthdl\propertyhdl.dll";
- Val64 = "[INSTALLLOCATION]Basis\program\shlxthdl\propertyhdl_x64.dll";
+ Value = "[INSTALLLOCATION]program\shlxthdl\propertyhdl.dll";
+ Val64 = "[INSTALLLOCATION]program\shlxthdl\propertyhdl_x64.dll";
End
RegistryItem gid_Regitem_Clsid_AE424E85_F6DF_4910_A6A9_438797986431_InProcServer32_ThreadingModel
diff --git a/setup_native/source/win32/customactions/patch/swappatchfiles.cxx b/setup_native/source/win32/customactions/patch/swappatchfiles.cxx
index 4819ed4..56c9404 100644
--- a/setup_native/source/win32/customactions/patch/swappatchfiles.cxx
+++ b/setup_native/source/win32/customactions/patch/swappatchfiles.cxx
@@ -623,7 +623,8 @@ extern "C" UINT __stdcall UninstallPatchedFiles( MSIHANDLE handle )
else
return ERROR_SUCCESS;
- std::_tstring sProgramDir = sInstDir + TEXT("Basis\\program\\");
+// std::_tstring sProgramDir = sInstDir + TEXT("Basis\\program\\");
+ std::_tstring sProgramDir = sInstDir + TEXT("program\\");
std::_tstring sPatchFile = sProgramDir + TEXT("patchlist.txt");
std::queue< std::_tstring > aSectionNames;
@@ -677,7 +678,8 @@ extern "C" UINT __stdcall UninstallPatchedFiles( MSIHANDLE handle )
extern "C" UINT __stdcall IsOfficeRunning( MSIHANDLE handle )
{
std::_tstring sInstDir = GetMsiProperty( handle, TEXT("INSTALLLOCATION") );
- std::_tstring sResourceDir = sInstDir + TEXT("Basis\\program\\resource\\");
+// std::_tstring sResourceDir = sInstDir + TEXT("Basis\\program\\resource\\");
+ std::_tstring sResourceDir = sInstDir + TEXT("program\\resource\\");
std::_tstring sPattern = sResourceDir + TEXT("vcl*.res");
WIN32_FIND_DATA aFindFileData;
@@ -857,7 +859,8 @@ extern "C" UINT __stdcall ShowOnlineUpdateDialog( MSIHANDLE handle )
// that offers the Online Update is superfluous.
std::_tstring sInstDir = GetMsiProperty( handle, TEXT("INSTALLLOCATION") );
- std::_tstring sProgramDir = sInstDir + TEXT("Basis\\program\\");
+// std::_tstring sProgramDir = sInstDir + TEXT("Basis\\program\\");
+ std::_tstring sProgramDir = sInstDir + TEXT("program\\");
std::_tstring sSearchFile = sProgramDir + TEXT("updchk.uno.dll");
WIN32_FIND_DATA data;
commit a673974e2026fe379f9c3e316c0dbd6baec3d657
Author: Jürgen Schmidt <jsc at apache.org>
Date: Fri Jun 7 12:26:49 2013 +0000
#122478# further cleanup for 3layer changes
diff --git a/desktop/scripts/unoinfo.sh b/desktop/scripts/unoinfo.sh
index 82fbe57..bb10207 100644
--- a/desktop/scripts/unoinfo.sh
+++ b/desktop/scripts/unoinfo.sh
@@ -34,14 +34,14 @@ sd_prog=`pwd`
case $1 in
c++)
- printf '%s' "$sd_prog/../basis-link/ure-link/lib"
+ printf '%s' "$sd_prog"
;;
java)
printf '0%s\0%s\0%s\0%s\0%s' \
- "$sd_prog/../basis-link/ure-link/share/java/ridl.jar" \
- "$sd_prog/../basis-link/ure-link/share/java/jurt.jar" \
- "$sd_prog/../basis-link/ure-link/share/java/juh.jar" \
- "$sd_prog/../basis-link/program/classes/unoil.jar" "$sd_prog"
+ "$sd_prog/classes/ridl.jar" \
+ "$sd_prog/classes/jurt.jar" \
+ "$sd_prog/classes/java/juh.jar" \
+ "$sd_prog/classes/unoil.jar" "$sd_prog"
;;
*)
exit 1
diff --git a/desktop/scripts/unopkg.sh b/desktop/scripts/unopkg.sh
index 71421e4..c0b5eac 100644
--- a/desktop/scripts/unopkg.sh
+++ b/desktop/scripts/unopkg.sh
@@ -58,7 +58,7 @@ fi
# extend the ld_library_path for java: javaldx checks the sofficerc for us
if [ -x "$sd_prog/../basis-link/ure-link/bin/javaldx" ] ; then
- my_path=`"$sd_prog/../basis-link/ure-link/bin/javaldx" $BOOTSTRAPVARS $JVMFWKPARAMS \
+ my_path=`"$sd_prog/javaldx" $BOOTSTRAPVARS $JVMFWKPARAMS \
"-env:INIFILENAME=vnd.sun.star.pathname:$sd_prog/redirectrc"`
if [ -n "$my_path" ] ; then
LD_LIBRARY_PATH=$my_path${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
diff --git a/desktop/win32/source/unoinfo.cxx b/desktop/win32/source/unoinfo.cxx
index 2268fec..dbf34cf 100644
--- a/desktop/win32/source/unoinfo.cxx
+++ b/desktop/win32/source/unoinfo.cxx
@@ -66,10 +66,7 @@ void writePath(
if (end == NULL) {
exit(EXIT_FAILURE);
}
- std::size_t n = (end - path) * sizeof (wchar_t);
- if (fwrite(path, 1, n, stdout) != n) {
- exit(EXIT_FAILURE);
- }
+ fprintf(stdout, "%S", path);
}
}
@@ -83,23 +80,12 @@ int wmain(int argc, wchar_t ** argv, wchar_t **) {
#endif
wchar_t path[MAX_PATH];
wchar_t * pathEnd = getBrandPath(path);
- if (tools::buildPath(path, path, pathEnd, MY_STRING(L"..\\basis-link"))
- == NULL)
- {
- exit(EXIT_FAILURE);
- }
- pathEnd = tools::resolveLink(path);
- if (pathEnd == NULL ||
- (tools::buildPath(path, path, pathEnd, MY_STRING(L"\\ure-link")) ==
- NULL))
- {
- exit(EXIT_FAILURE);
- }
- pathEnd = tools::resolveLink(path);
+
if (pathEnd == NULL) {
exit(EXIT_FAILURE);
}
- writePath(path, pathEnd, MY_STRING(L"\\bin"));
+
+ writePath(path, pathEnd, MY_STRING(L""));
#ifdef __MINGW32__
} else if (argc == 2 && strcmp(argv[1], "java") == 0) {
#else
@@ -111,32 +97,17 @@ int wmain(int argc, wchar_t ** argv, wchar_t **) {
wchar_t path[MAX_PATH];
wchar_t * pathEnd = getBrandPath(path);
writePath(path, pathEnd, MY_STRING(L""));
- if (tools::buildPath(path, path, pathEnd, MY_STRING(L"..\\basis-link"))
- == NULL)
- {
- exit(EXIT_FAILURE);
- }
- pathEnd = tools::resolveLink(path);
if (pathEnd == NULL) {
exit(EXIT_FAILURE);
}
writeNull();
- writePath(path, pathEnd, MY_STRING(L"\\program\\classes\\unoil.jar"));
- if (tools::buildPath(path, path, pathEnd, MY_STRING(L"\\ure-link")) ==
- NULL)
- {
- exit(EXIT_FAILURE);
- }
- pathEnd = tools::resolveLink(path);
- if (pathEnd == NULL) {
- exit(EXIT_FAILURE);
- }
+ writePath(path, pathEnd, MY_STRING(L"classes\\unoil.jar"));
writeNull();
- writePath(path, pathEnd, MY_STRING(L"\\java\\ridl.jar"));
+ writePath(path, pathEnd, MY_STRING(L"\classes\\ridl.jar"));
writeNull();
- writePath(path, pathEnd, MY_STRING(L"\\java\\jurt.jar"));
+ writePath(path, pathEnd, MY_STRING(L"classes\\jurt.jar"));
writeNull();
- writePath(path, pathEnd, MY_STRING(L"\\java\\juh.jar"));
+ writePath(path, pathEnd, MY_STRING(L"classes\\juh.jar"));
} else {
exit(EXIT_FAILURE);
}
commit 01df80b40a193bb9f57c6a2d025ce89e79a2978b
Author: Jürgen Schmidt <jsc at apache.org>
Date: Fri Jun 7 12:21:31 2013 +0000
#122477# adapt config script, support 64bit Windows, fix search path
diff --git a/odk/cfgWin.js b/odk/cfgWin.js
index 53dd180..f574fe3 100644
--- a/odk/cfgWin.js
+++ b/odk/cfgWin.js
@@ -18,10 +18,13 @@
// under the License.
//
// *************************************************************
+
// This script asks for variables, which are necessary for building the
// examples of the Office Development Kit. The script duplicates the template
// script and inserts the variables into the copied script.
// The Script was developed for the operating systems Microsoft Windows.
+var regKeyOfficeCurrentUser6432Node = "HKEY_CURRENT_USER\\Software\\Wow6432Node\\OpenOffice\\UNO\\InstallPath\\";
+var regKeyOfficeLocaleMachine6432Node = "HKEY_LOCAL_MACHINE\\Software\\Wow6432Node\\OpenOffice\\UNO\\InstallPath\\";
var regKeyOfficeCurrentUser = "HKEY_CURRENT_USER\\Software\\OpenOffice\\UNO\\InstallPath\\";
var regKeyOfficeLocaleMachine = "HKEY_LOCAL_MACHINE\\Software\\OpenOffice\\UNO\\InstallPath\\";
var regKeyDotNetInstallRoot = "HKEY_LOCAL_MACHINE\\Software\\Microsoft\\.NETFramework\\InstallRoot";
@@ -58,7 +61,6 @@ var oo_user_sdk_env_script=oo_user_sdk_dir + "\\setsdkenv_windows.bat";
var office_home=getOfficeHome();
var office_base_home=getOfficeBaseHome();
-var oo_sdk_ure_home=getUreHome();
var oo_sdk_make_home=getMakeHome();
var oo_sdk_zip_home=getZipHome();
@@ -174,16 +176,32 @@ function getOfficeHome()
if (sSuggestedHome.length == 0)
{
try {
- sSuggestedHome = WshShell.RegRead(regKeyOfficeCurrentUser);
- //The registry entry points to the program folder but we need the
- //installation folder
+ sSuggestedHome = WshShell.RegRead(regKeyOfficeCurrentUser6432Node);
+ //The registry entry points to the program folder but we need the
+ //installation folder
} catch(exc) {}
if (sSuggestedHome.length == 0)
{
try {
+ sSuggestedHome = WshShell.RegRead(regKeyOfficeLocaleMachine6432Node);
+ //The registry entry points to the program folder but we need
+ //the installation folder
+ } catch (exc) {}
+ }
+ if (sSuggestedHome.length == 0)
+ {
+ try {
sSuggestedHome = WshShell.RegRead(regKeyOfficeLocaleMachine);
//The registry entry points to the program folder but we need
- //the installation folder
+ //the installation folder
+ } catch (exc) {}
+ }
+ if (sSuggestedHome.length == 0)
+ {
+ try {
+ sSuggestedHome = WshShell.RegRead(regKeyOfficeLocaleMachine);
+ //The registry entry points to the program folder but we need
+ //the installation folder
} catch (exc) {}
}
@@ -245,7 +263,7 @@ function searchOffice()
var officepath ="";
var index=-1;
- if ((index = tmp.lastIndexOf("\\Basis")) != -1) {
+ if ((index = tmp.lastIndexOf("\\sdk")) != -1) {
tmp = tmp.substr(0, index);
}
@@ -267,39 +285,6 @@ function getOfficeBaseHome()
return officebase;
}
-function getUreHome()
-{
- var tmpure = oo_sdk_home;
- var ure = "";
- var index=0;
- if ((index = tmpure.lastIndexOf("Basis")) != -1)
- tmpure = tmpure.substr(0, index);
-
- if (aFileSystemObject.FileExists(tmpure + "\\URE\\bin\\uno.exe")) {
- ure = tmpure + "\URE";
- }
-
- return ure;
-
-/*
- var suggestion = WshSysEnv("OO_SDK_URE_HOME");
- var choice;
- for (;;) {
- stdout.Write(
- "\n Enter the URE installation directory [" + suggestion + "]:");
- choice = stdin.ReadLine();
- if (choice == "") {
- choice = suggestion;
- }
- if (aFileSystemObject.FileExists(choice + "\\bin\\uno.exe")) {
- break;
- }
- stdout.WriteLine("\n Error: A valid URE installation is required.");
- }
- return choice;
-*/
-}
-
function getMakeHome()
{
var sSuggestedHome = WshSysEnv("OO_SDK_MAKE_HOME");
@@ -352,6 +337,10 @@ function getMakeHome()
function getZipHome()
{
var sSuggestedHome = WshSysEnv("OO_SDK_ZIP_HOME");
+
+ if (sSuggestedHome.length == 0 && oo_sdk_make_home.length > 0) {
+ sSuggestedHome = oo_sdk_make_home;
+ }
while(true)
{
@@ -399,6 +388,10 @@ function getCatHome()
{
var sSuggestedHome = WshSysEnv("OO_SDK_CAT_HOME");
+ if (sSuggestedHome.length == 0 && oo_sdk_make_home.length > 0) {
+ sSuggestedHome = oo_sdk_make_home;
+ }
+
while(true)
{
stdout.Write("\n Enter a cat (2.0 or higher) tools directory [" +
@@ -451,6 +444,10 @@ function getSedHome()
{
var sSuggestedHome = WshSysEnv("OO_SDK_SED_HOME");
+ if (sSuggestedHome.length == 0 && oo_sdk_make_home.length > 0) {
+ sSuggestedHome = oo_sdk_make_home;
+ }
+
while(true)
{
stdout.Write("\n Enter a sed (3.02 or higher) tools directory [" +
@@ -925,75 +922,61 @@ function writeBatFile(fdir, file)
"REM are necessary for building the examples of the Office Development Kit.\n" +
"REM The Script was developed for the operating systems Windows.\n" +
"REM The SDK name\n" +
- "REM Example: @set OO_SDK_NAME=openoffice4.0_sdk\n" +
- "@set OO_SDK_NAME=" + oo_sdk_name +
- "\n\n" +
+ "REM Example: @set \"OO_SDK_NAME=openoffice4.0_sdk\"\n" +
+ "@set \"OO_SDK_NAME=" + oo_sdk_name +
+ "\"\n\n" +
"REM Installation directory of the Software Development Kit.\n" +
- "REM Example: @set OO_SDK_HOME=C:\\Program Files\\OpenOffice\\4\\sdk\n" +
- "@set OO_SDK_HOME=" + oo_sdk_home +
- "\n\n" +
+ "REM Example: @set \"OO_SDK_HOME=C:\\Program Files\\OpenOffice\\4\\sdk\"\n" +
+ "@set \"OO_SDK_HOME=" + oo_sdk_home +
+ "\"\n\n" +
"REM Office installation directory.\n" +
- "REM Example: @set OFFICE_HOME=C:\\Program Files\\OpenOffice 4\n" +
- "@set OFFICE_HOME=" + office_home +
- "\n\n" +
+ "REM Example: @set \"OFFICE_HOME=C:\\Program Files\\OpenOffice 4\"\n" +
+ "@set \"OFFICE_HOME=" + office_home +
+ "\"\n\n" +
"REM Directory of the make command.\n" +
- "REM Example: @set OO_SDK_MAKE_HOME=C:\\UnxUtils\\usr\\local\\wbin\n" +
- "@set OO_SDK_MAKE_HOME=" + oo_sdk_make_home +
- "\n\n" +
+ "REM Example: @set \"OO_SDK_MAKE_HOME=C:\\UnxUtils\\usr\\local\\wbin\"\n" +
+ "@set \"OO_SDK_MAKE_HOME=" + oo_sdk_make_home +
+ "\"\n\n" +
"REM Directory of the zip tool.\n" +
- "REM Example: @set OO_SDK_ZIP_HOME=C:\\UnxUtils\\usr\\local\\wbin\n" +
- "@set OO_SDK_ZIP_HOME=" + oo_sdk_zip_home +
- "\n\n" +
+ "REM Example: @set \"OO_SDK_ZIP_HOME=C:\\UnxUtils\\usr\\local\\wbin\"\n" +
+ "@set \"OO_SDK_ZIP_HOME=" + oo_sdk_zip_home +
+ "\"\n\n" +
"REM Directory of the cat tool.\n" +
- "REM Example: @set OO_SDK_CAT_HOME=C:\\UnxUtils\\usr\\local\\wbin\n" +
- "@set OO_SDK_CAT_HOME=" + oo_sdk_cat_home +
- "\n\n" +
+ "REM Example: @set \"OO_SDK_CAT_HOME=C:\\UnxUtils\\usr\\local\\wbin\"\n" +
+ "@set \"OO_SDK_CAT_HOME=" + oo_sdk_cat_home +
+ "\"\n\n" +
"REM Directory of the sed tool.\n" +
- "REM Example: @set OO_SDK_SED_HOME=C:\\UnxUtils\\usr\\local\\wbin\n" +
- "@set OO_SDK_SED_HOME=" + oo_sdk_sed_home +
- "\n\n" +
+ "REM Example: @set \"OO_SDK_SED_HOME=C:\\UnxUtils\\usr\\local\\wbin\"\n" +
+ "@set \"OO_SDK_SED_HOME=" + oo_sdk_sed_home +
+ "\"\n\n" +
"REM Directory of the C++ compiler.\n" +
- "REM Example: @set OO_SDK_CPP_HOME=C:\\Program Files\\Microsoft Visual Studio 9.0\\VC\\bin\n" +
- "@set OO_SDK_CPP_HOME=" + oo_sdk_cpp_home +
- "\n at set CPP_MANIFEST=" + oo_sdk_manifest_used +
- "\n at set CPP_WINDOWS_SDK=" + oo_sdk_windowssdk +
- "\n\n" +
+ "REM Example: @set \"OO_SDK_CPP_HOME=C:\\Program Files\\Microsoft Visual Studio 9.0\\VC\\bin\"\n" +
+ "@set \"OO_SDK_CPP_HOME=" + oo_sdk_cpp_home +
+ "\"\n at set \"CPP_MANIFEST=" + oo_sdk_manifest_used +
+ "\"\n at set \"CPP_WINDOWS_SDK=" + oo_sdk_windowssdk +
+ "\"\n\n" +
"REM Directory of the C# and VB.NET compilers.\n" +
- "REM Example: @set OO_SDK_CLI_HOME=C:\\WINXP\\Microsoft.NET\\Framework\\v1.0.3705\n" +
- "@set OO_SDK_CLI_HOME=" + oo_sdk_cli_home +
- "\n\n" +
+ "REM Example: @set \"OO_SDK_CLI_HOME=C:\\WINXP\\Microsoft.NET\\Framework\\v1.0.3705\"\n" +
+ "@set \"OO_SDK_CLI_HOME=" + oo_sdk_cli_home +
+ "\"\n\n" +
"REM Java SDK installation directory.\n" +
- "REM Example: set OO_SDK_JAVA_HOME=C:\\Program Files\\Java\\jdk1.6.0_05\n" +
- "@set OO_SDK_JAVA_HOME=" + oo_sdk_java_home +
- "\n\n" +
+ "REM Example: @set \"OO_SDK_JAVA_HOME=C:\\Program Files\\Java\\jdk1.6.0_05\"\n" +
+ "@set \"OO_SDK_JAVA_HOME=" + oo_sdk_java_home +
+ "\"\n\n" +
"REM Special output directory\n" +
- "REM Example: @set OO_SDK_OUT=C:\\" + oo_sdk_name + "\n" +
- "@set OO_SDK_OUT=" + oo_sdk_out +
- "\n\n" +
+ "REM Example: @set \"OO_SDK_OUT=C:\\" + oo_sdk_name + "\"\n" +
+ "@set \"OO_SDK_OUT=" + oo_sdk_out +
+ "\"\n\n" +
"REM Automatic deployment\n" +
- "REM Example: @set SDK_AUTO_DEPLOYMENT=YES\n" +
- "@set SDK_AUTO_DEPLOYMENT=" + sdk_auto_deployment +
- "\n\n" +
- "@set STLDEBUG=" + stldebug + "\n" +
- "REM check stlport lib in 4NT shell\n" +
- "REM if exist \"%OO_SDK_HOME%\\windows\\lib\\stlport_vc71_stldebug.lib\". (\n" +
- "REM @set STLDEBUG=_stldebug\n" +
- "REM )\n\n" +
- "REM Check installation path for the Office Development Kit.\n" +
+ "REM Example: @set \"SDK_AUTO_DEPLOYMENT=YES\"\n" +
+ "@set \"SDK_AUTO_DEPLOYMENT=" + sdk_auto_deployment +
+ "\"\n\n" +
+ "REM Check installation path for the Office Development Kit.\n" +
"if not defined OO_SDK_HOME (\n" +
" echo Error: the variable OO_SDK_HOME is missing!\n" +
" goto :error\n" +
" )\n" +
- "\n" +
- "REM Check installation path for the office.\n" +
- "REM if not defined OFFICE_HOME (\n" +
- "REM if not defined OO_SDK_URE_HOME (\n" +
- "REM echo Error: either of the variables OFFICE_HOME and\n" +
- "REM echo OO_SDK_URE_HOME is missing!\n" +
- "REM goto :error\n" +
- "REM )\n" +
- "REM )\n" +
- "\n" +
+ "\n\n" +
"REM Check installation path for GNU make.\n" +
"if not defined OO_SDK_MAKE_HOME (\n" +
" echo Error: the variable OO_SDK_MAKE_HOME is missing!\n" +
@@ -1019,55 +1002,50 @@ function writeBatFile(fdir, file)
" )\n" +
"\n" +
"REM Set library path. \n" +
- "@set LIB=%OO_SDK_HOME%\\lib;%LIB%\n" +
+ "@set \"LIB=%OO_SDK_HOME%\\lib;%LIB%\"\n" +
"if defined CPP_WINDOWS_SDK (\n" +
- " @set LIB=%LIB%;%CPP_WINDOWS_SDK%\\lib\n" +
+ " @set \"LIB=%LIB%;%CPP_WINDOWS_SDK%\\lib\"\n" +
" )\n" +
"\n" +
"REM Set office program path.\n" +
"if defined OFFICE_HOME (\n" +
- " @set OFFICE_PROGRAM_PATH=%OFFICE_HOME%\\program\n" +
+ " @set \"OFFICE_PROGRAM_PATH=%OFFICE_HOME%\\program\"\n" +
" )" +
"\n" +
"REM Set UNO path, necessary to ensure that the cpp examples using the\n" +
"REM new UNO bootstrap mechanism use the configured office installation\n" +
"REM (only set when using an Office).\n" +
"if defined OFFICE_HOME (\n" +
- " @set UNO_PATH=%OFFICE_PROGRAM_PATH%\n" +
+ " @set \"UNO_PATH=%OFFICE_PROGRAM_PATH%\"\n" +
" )\n" +
- "\n" +
- "REM @set OO_SDK_URE_BIN_DIR=%OO_SDK_URE_HOME%\\bin\n" +
- "REM @set OO_SDK_URE_LIB_DIR=%OO_SDK_URE_HOME%\\bin\n" +
- "REM @set OO_SDK_URE_JAVA_DIR=%OO_SDK_URE_HOME%\\java\n" +
- "\n" +
- "@set OO_SDK_OFFICE_BIN_DIR=%OFFICE_PROGRAM_PATH%\n" +
- "@set OO_SDK_OFFICE_LIB_DIR=%OFFICE_BASE_PROGRAM_PATH%\n" +
- "@set OO_SDK_OFFICE_JAVA_DIR=%OFFICE_BASE_PROGRAM_PATH%\\classes\n" +
- "REM )\n" +
+ "\n\n" +
+ "@set \"OO_SDK_OFFICE_BIN_DIR=%OFFICE_PROGRAM_PATH%\"\n" +
+ "@set \"OO_SDK_OFFICE_LIB_DIR=%OFFICE_BASE_PROGRAM_PATH%\"\n" +
+ "@set \"OO_SDK_OFFICE_JAVA_DIR=%OFFICE_BASE_PROGRAM_PATH%\\classes\"\n" +
"\n" +
"REM Set classpath\n" +
- "@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;%OO_SDK_OFFICE_JAVA_DIR%\\unoil.jar\n" +
+ "@set \"CLASSPATH=%OO_SDK_OFFICE_JAVA_DIR%\\juh.jar;%OO_SDK_OFFICE_JAVA_DIR%\\jurt.jar;%OO_SDK_OFFICE_JAVA_DIR%\\ridl.jar;%OO_SDK_OFFICE_JAVA_DIR%\\unoloader.jar;%OO_SDK_OFFICE_JAVA_DIR%\\unoil.jar\"\n" +
"\n" +
"REM Add directory of the SDK tools to the path.\n" +
- "set PATH=%OO_SDK_HOME%\\bin;%OO_SDK_URE_BIN_DIR%;%OO_SDK_OFFICE_BIN_DIR%;%OO_SDK_HOME%\\WINexample.out\\bin;%OO_SDK_MAKE_HOME%;%OO_SDK_ZIP_HOME%;%OO_SDK_CAT_HOME%;%OO_SDK_SED_HOME%;%PATH%\n" +
+ "set \"PATH=%OO_SDK_HOME%\\bin;%OO_SDK_OFFICE_BIN_DIR%;%OO_SDK_OFFICE_BIN_DIR%;%OO_SDK_HOME%\\WINexample.out\\bin;%OO_SDK_MAKE_HOME%;%OO_SDK_ZIP_HOME%;%OO_SDK_CAT_HOME%;%OO_SDK_SED_HOME%;%PATH%\"\n" +
"\n" +
"REM Set PATH appropriate to the output directory\n" +
"if defined OO_SDK_OUT (\n" +
- " @set PATH=%OO_SDK_OUT%\\WINexample.out\\bin;%PATH%\n" +
+ " @set \"PATH=%OO_SDK_OUT%\\WINexample.out\\bin;%PATH%\"\n" +
" ) else (\n" +
- " @set PATH=%OO_SDK_HOME%\\WINexample.out\\bin;%PATH%\n" +
+ " @set \"PATH=%OO_SDK_HOME%\\WINexample.out\\bin;%PATH%\"\n" +
" )\n" +
"\n" +
"REM Add directory of the Win SDK to the path, if necessary.\n" +
"if defined CPP_WINDOWS_SDK (\n" +
- " @set PATH=%CPP_WINDOWS_SDK\\bin%;%PATH%\n" +
- " @set INCLUDE=%CPP_WINDOWS_SDK\\Include%;%INCLUDE%\n" +
+ " @set \"PATH=%CPP_WINDOWS_SDK\\bin%;%PATH%\"\n" +
+ " @set \"INCLUDE=%CPP_WINDOWS_SDK\\Include%;%INCLUDE%\"\n" +
")\n" +
"REM Add directory of the C# and VB.NET compilers to the path, if necessary.\n" +
- "if defined OO_SDK_CLI_HOME @set PATH=%OO_SDK_CLI_HOME%;%PATH%\n" +
+ "if defined OO_SDK_CLI_HOME @set \"PATH=%OO_SDK_CLI_HOME%;%PATH%\"\n" +
"\n" +
"REM Add directory of the Java tools to the path, if necessary.\n" +
- "if defined OO_SDK_JAVA_HOME @set PATH=%OO_SDK_JAVA_HOME%\\bin;%OO_SDK_JAVA_HOME%\\jre\\bin;%PATH%\n" +
+ "if defined OO_SDK_JAVA_HOME @set \"PATH=%OO_SDK_JAVA_HOME%\\bin;%OO_SDK_JAVA_HOME%\\jre\\bin;%PATH%\"\n" +
"\n" +
"REM Set environment for C++ compiler tools, if necessary.\n" +
"if defined OO_SDK_CPP_HOME call \"%OO_SDK_CPP_HOME%\\VCVARS32.bat\"\n" +
diff --git a/odk/setsdkenv_windows.template b/odk/setsdkenv_windows.template
index 501a2f8..cc5e7c4 100644
--- a/odk/setsdkenv_windows.template
+++ b/odk/setsdkenv_windows.template
@@ -1,177 +1,133 @@
@echo off
-REM *************************************************************
-REM
-REM Licensed to the Apache Software Foundation (ASF) under one
-REM or more contributor license agreements. See the NOTICE file
-REM distributed with this work for additional information
-REM regarding copyright ownership. The ASF licenses this file
-REM to you under the Apache License, Version 2.0 (the
-REM "License")rem you may not use this file except in compliance
-REM with the License. You may obtain a copy of the License at
-REM
-REM http://www.apache.org/licenses/LICENSE-2.0
-REM
-REM Unless required by applicable law or agreed to in writing,
-REM software distributed under the License is distributed on an
-REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-REM KIND, either express or implied. See the License for the
-REM specific language governing permissions and limitations
-REM under the License.
-REM
-REM *************************************************************
REM This script sets all enviroment variables, which
REM are necessary for building the examples of the Office Development Kit.
REM The Script was developed for the operating systems Windows.
REM The SDK name
-REM Example: set OO_SDK_NAME=openoffice4.0_sdk
-set OO_SDK_NAME=openoffice4.0_sdk
+REM Example: @set "OO_SDK_NAME=openoffice4.0_sdk"
+ at set "OO_SDK_NAME=<your_input_here>"
REM Installation directory of the Software Development Kit.
-REM Example: set OO_SDK_HOME=C:\Program Files\OpenOffice 4\sdk
- at set OO_SDK_HOME=
+REM Example: @set "OO_SDK_HOME=C:\Program Files\OpenOffice\4\sdk"
+ at set "OO_SDK_HOME=<your_input_here>"
REM Office installation directory.
-REM Example: set OFFICE_HOME=C:\Program Files\OpenOffice 4
- at set OFFICE_HOME=
+REM Example: @set "OFFICE_HOME=C:\Program Files\OpenOffice 4"
+ at set "OFFICE_HOME=<your_input_here>"
REM Directory of the make command.
-REM Example: set OO_SDK_MAKE_HOME=C:\UnixTools\usr\local\wbin
- at set OO_SDK_MAKE_HOME=
+REM Example: @set "OO_SDK_MAKE_HOME=C:\UnxUtils\usr\local\wbin"
+ at set "OO_SDK_MAKE_HOME=<your_input_here>"
REM Directory of the zip tool.
-REM Example: set OO_SDK_ZIP_HOME=C:\UnixTools\usr\local\wbin
- at set OO_SDK_ZIP_HOME=
+REM Example: @set "OO_SDK_ZIP_HOME=C:\UnxUtils\usr\local\wbin"
+ at set "OO_SDK_ZIP_HOME=<your_input_here>"
REM Directory of the cat tool.
-REM Example: set OO_SDK_CAT_HOME=C:\UnxUtils\usr\local\wbin
- at set OO_SDK_CAT_HOME=
+REM Example: @set "OO_SDK_CAT_HOME=C:\UnxUtils\usr\local\wbin"
+ at set "OO_SDK_CAT_HOME=<your_input_here>"
REM Directory of the sed tool.
-REM Example: set OO_SDK_SED_HOME=C:\UnxUtils\usr\local\wbin
- at set OO_SDK_SED_HOME=
+REM Example: @set "OO_SDK_SED_HOME=C:\UnxUtils\usr\local\wbin"
+ at set "OO_SDK_SED_HOME=<your_input_here>"
REM Directory of the C++ compiler.
-REM Example:set OO_SDK_CPP_HOME=C:\Program Files\Microsoft Visual Studio 9.0\VC\bin
- at set OO_SDK_CPP_HOME=
- at set CPP_MANIFEST=
- at set CPP_WINDOWS_SDK=
+REM Example: @set "OO_SDK_CPP_HOME=C:\Program Files\Microsoft Visual Studio 9.0\VC\bin"
+ at set "OO_SDK_CPP_HOME=<your_input_here>"
+ at set "CPP_MANIFEST=true"
+ at set "CPP_WINDOWS_SDK=<your_input_here>"
REM Directory of the C# and VB.NET compilers.
-REM Example:set OO_SDK_CLI_HOME=C:\WINXP\Microsoft.NET\Framework\v1.0.3705
- at set OO_SDK_CLI_HOME=
+REM Example: @set "OO_SDK_CLI_HOME=C:\WINXP\Microsoft.NET\Framework\v1.0.3705"
+ at set "OO_SDK_CLI_HOME=<your_input_here>"
REM Java SDK installation directory.
-REM Example: set OO_SDK_JAVA_HOME=C:\Program Files\Java\jdk1.6.0_05
- at set OO_SDK_JAVA_HOME=
+REM Example: @set "OO_SDK_JAVA_HOME=C:\Program Files\Java\jdk1.6.0_05"
+ at set "OO_SDK_JAVA_HOME=<your_input_here>"
REM Special output directory
-REM Example: set OO_SDK_OUT=C:\openoffice4.0_sdk
- at set OO_SDK_OUT=
+REM Example: @set "OO_SDK_OUT=C:\openoffice4.0_sdk"
+ at set "OO_SDK_OUT=<your_input_here>"
REM Automatic deployment
-REM Example: set SDK_AUTO_DEPLOYMENT=YES
- at set SDK_AUTO_DEPLOYMENT=YES
-
- at set STLDEBUG=
-REM check stlport lib in 4NT shell
-REM if exist "%OO_SDK_HOME%\windows\lib\stlport_vc71_stldebug.lib". (
-REM @set STLDEBUG=_stldebug
-REM )
+REM Example: @set "SDK_AUTO_DEPLOYMENT=YES"
+ at set "SDK_AUTO_DEPLOYMENT=YES"
REM Check installation path for the Office Development Kit.
if not defined OO_SDK_HOME (
echo Error: the variable OO_SDK_HOME is missing!
- goto error
+ goto :error
)
+
REM Check installation path for GNU make.
if not defined OO_SDK_MAKE_HOME (
echo Error: the variable OO_SDK_MAKE_HOME is missing!
- goto error
+ goto :error
)
REM Check installation path for the zip tool.
if not defined OO_SDK_ZIP_HOME (
echo Error: the variable OO_SDK_ZIP_HOME is missing!
- goto error
+ goto :error
)
REM Check installation path for the cat tool.
if not defined OO_SDK_CAT_HOME (
echo Error: the variable OO_SDK_CAT_HOME is missing!
- goto error
+ goto :error
)
REM Check installation path for the sed tool.
if not defined OO_SDK_SED_HOME (
echo Error: the variable OO_SDK_SED_HOME is missing!
- goto error
+ goto :error
)
REM Set library path.
- at set LIB=%OO_SDK_HOME%\lib;%LIB%
+ at set "LIB=%OO_SDK_HOME%\lib;%LIB%"
if defined CPP_WINDOWS_SDK (
- @set LIB=%LIB%;%CPP_WINDOWS_SDK%\lib
+ @set "LIB=%LIB%;%CPP_WINDOWS_SDK%\lib"
)
REM Set office program path.
if defined OFFICE_HOME (
- @set OFFICE_PROGRAM_PATH=%OFFICE_HOME%\program
+ @set "OFFICE_PROGRAM_PATH=%OFFICE_HOME%\program"
)
-
REM Set UNO path, necessary to ensure that the cpp examples using the
REM new UNO bootstrap mechanism use the configured office installation
REM (only set when using an Office).
if defined OFFICE_HOME (
- @set UNO_PATH=%OFFICE_PROGRAM_PATH%
-)
+ @set "UNO_PATH=%OFFICE_PROGRAM_PATH%"
+ )
-REM set OO_SDK_URE_BIN_DIR=%OFFICE_PROGRAM_PATH%
-REM set OO_SDK_URE_LIB_DIR=%OFFICE_PROGRAM_PATH%
-REM set OO_SDK_URE_JAVA_DIR=%OFFICE_PROGRAM_PATH%\classes
- at set OO_SDK_OFFICE_BIN_DIR=%OFFICE_PROGRAM_PATH%
- at set OO_SDK_OFFICE_LIB_DIR=%OFFICE_PROGRAM_PATH%
- at set OO_SDK_OFFICE_JAVA_DIR=%OFFICE_PROGRAM_PATH%\classes
+ at set "OO_SDK_OFFICE_BIN_DIR=%OFFICE_PROGRAM_PATH%"
+ at set "OO_SDK_OFFICE_LIB_DIR=%OFFICE_BASE_PROGRAM_PATH%"
+ at set "OO_SDK_OFFICE_JAVA_DIR=%OFFICE_BASE_PROGRAM_PATH%\classes"
REM Set classpath
- at set CLASSPATH=%OO_SDK_OFFICE_JAVA_DIR%\juh.jar;%OO_SDK_OFFICE_JAVA_DIR%\jurt.jar;%OO_SDK_OFFICE_JAVA_DIR%\ridl.jar;%OO_SDK_OFFICE_JAVA_DIR%\unoloader.jar;%OO_SDK_OFFICE_JAVA_DIR%\unoil.jar
+ at set "CLASSPATH=%OO_SDK_OFFICE_JAVA_DIR%\juh.jar;%OO_SDK_OFFICE_JAVA_DIR%\jurt.jar;%OO_SDK_OFFICE_JAVA_DIR%\ridl.jar;%OO_SDK_OFFICE_JAVA_DIR%\unoloader.jar;%OO_SDK_OFFICE_JAVA_DIR%\unoil.jar"
REM Add directory of the SDK tools to the path.
- at set PATH=%OO_SDK_HOME%\bin;%OO_SDK_OFFICE_BIN_DIR%;%OO_SDK_HOME%\WINexample.out\bin;%OO_SDK_MAKE_HOME%;%OO_SDK_ZIP_HOME%;%OO_SDK_CAT_HOME%;%OO_SDK_SED_HOME%;%PATH%
+set "PATH=%OO_SDK_HOME%\bin;%OO_SDK_OFFICE_BIN_DIR%;%OO_SDK_OFFICE_BIN_DIR%;%OO_SDK_HOME%\WINexample.out\bin;%OO_SDK_MAKE_HOME%;%OO_SDK_ZIP_HOME%;%OO_SDK_CAT_HOME%;%OO_SDK_SED_HOME%;%PATH%"
+REM Set PATH appropriate to the output directory
if defined OO_SDK_OUT (
- @set PATH=%OO_SDK_OUT%\WINexample.out\bin;%PATH%
-) else (
- @set PATH=%OO_SDK_HOME%\WINexample.out\bin;%PATH%
-)
-
-REM Add directory of the command make to the path, if necessary.
-REM if defined OO_SDK_MAKE_HOME @set PATH+=%OO_SDK_MAKE_HOME%
-
-Rem Add directory of the zip tool to the path, if necessary.
-REM if defined OO_SDK_ZIP_HOME @set PATH+=%OO_SDK_ZIP_HOME%
-
-REM Add directory of the cat tool to the path, if necessary.
-REM if defined OO_SDK_CAT_HOME @set PATH+=%OO_SDK_CAT_HOME
-
-REM Add directory of the sed tool to the path, if necessary.
-REM if defined OO_SDK_SED_HOME @set PATH+=%OO_SDK_SED_HOME%
-
-REM Add directory of the C++ compiler to the path, if necessary.
-REM if defined OO_SDK_CPP_HOME @set PATH+=%OO_SDK_CPP_HOME%
+ @set "PATH=%OO_SDK_OUT%\WINexample.out\bin;%PATH%"
+ ) else (
+ @set "PATH=%OO_SDK_HOME%\WINexample.out\bin;%PATH%"
+ )
REM Add directory of the Win SDK to the path, if necessary.
if defined CPP_WINDOWS_SDK (
- @set PATH=%CPP_WINDOWS_SDK%\bin;%PATH%
- @set INCLUDE=%CPP_WINDOWS_SDK%\Include;%INCLUDE%
+ @set "PATH=%CPP_WINDOWS_SDK\bin%;%PATH%"
+ @set "INCLUDE=%CPP_WINDOWS_SDK\Include%;%INCLUDE%"
)
-
REM Add directory of the C# and VB.NET compilers to the path, if necessary.
-if defined OO_SDK_CLI_HOME @set PATH=%OO_SDK_CLI_HOME%;%PATH%
+if defined OO_SDK_CLI_HOME @set "PATH=%OO_SDK_CLI_HOME%;%PATH%"
REM Add directory of the Java tools to the path, if necessary.
-if defined OO_SDK_JAVA_HOME @set PATH=%OO_SDK_JAVA_HOME%\bin;%OO_SDK_JAVA_HOME%\jre\bin;%PATH%
+if defined OO_SDK_JAVA_HOME @set "PATH=%OO_SDK_JAVA_HOME%\bin;%OO_SDK_JAVA_HOME%\jre\bin;%PATH%"
REM Set environment for C++ compiler tools, if necessary.
if defined OO_SDK_CPP_HOME call "%OO_SDK_CPP_HOME%\VCVARS32.bat"
@@ -199,10 +155,9 @@ echo * Auto deployment = %SDK_AUTO_DEPLOYMENT%
echo *
echo ******************************************************************
echo.
-goto:end
+goto end
-:error
+ :error
Error: Please insert the necessary environment variables into the batch file.
-:end
-
+ :end
More information about the Libreoffice-commits
mailing list