[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - drawinglayer/Library_drawinglayer.mk editeng/Library_editeng.mk framework/Library_fwi.mk framework/Library_fwk.mk framework/Library_fwl.mk framework/Library_fwm.mk odk/cfgWin.js odk/configure.pl odk/setsdkenv_unix odk/setsdkenv_unix.sh.in odk/setsdkenv_windows.template odk/settings postprocess/packcomponents Repository.mk scp2/source sfx2/Library_qstart.mk sfx2/Library_sfx.mk solenv/inc svtools/Library_hatchwindowfactory.mk svtools/Library_svt.mk svx/Library_svxcore.mk svx/Library_svx.mk svx/Library_textconversiondlgs.mk sw/Library_msword.mk sw/Library_sw.mk sw/Library_swui.mk sw/Library_vbaswobj.mk toolkit/Library_tk.mk toolkit/util vbahelper/Library_msforms.mk vbahelper/Library_vbahelper.mk vcl/source
Jürgen Schmidt
jsc at apache.org
Fri May 31 01:07:37 PDT 2013
Repository.mk | 2
drawinglayer/Library_drawinglayer.mk | 2
editeng/Library_editeng.mk | 2
framework/Library_fwi.mk | 2
framework/Library_fwk.mk | 2
framework/Library_fwl.mk | 2
framework/Library_fwm.mk | 2
odk/cfgWin.js | 161 +++++++----------
odk/configure.pl | 312 ++++++++++-----------------------
odk/setsdkenv_unix | 8
odk/setsdkenv_unix.sh.in | 36 ---
odk/setsdkenv_windows.template | 175 ++++++------------
odk/settings/settings.mk | 28 +-
odk/settings/std.mk | 22 +-
odk/settings/stdtarget.mk | 2
postprocess/packcomponents/makefile.mk | 2
scp2/source/ooo/file_library_ooo.scp | 2
scp2/source/sdkoo/sdkoo.scp | 34 +--
sfx2/Library_qstart.mk | 2
sfx2/Library_sfx.mk | 2
solenv/inc/libs.mk | 4
svtools/Library_hatchwindowfactory.mk | 2
svtools/Library_svt.mk | 2
svx/Library_svx.mk | 2
svx/Library_svxcore.mk | 2
svx/Library_textconversiondlgs.mk | 4
sw/Library_msword.mk | 2
sw/Library_sw.mk | 2
sw/Library_swui.mk | 2
sw/Library_vbaswobj.mk | 2
toolkit/Library_tk.mk | 20 +-
toolkit/util/ootk.component | 302 +++++++++++++++++++++++++++++++
vbahelper/Library_msforms.mk | 2
vbahelper/Library_vbahelper.mk | 2
vcl/source/app/svapp.cxx | 2
35 files changed, 614 insertions(+), 538 deletions(-)
New commits:
commit 894ae72e805d5fc04b4004e7ae95cebf50ceacf1
Author: Jürgen Schmidt <jsc at apache.org>
Date: Fri May 31 07:27:08 2013 +0000
#122356# rename toolkit lib due to conflicts on MacOS, it's a workaround for conflicts with sqlite..., will be probably solved with dropping mozilla libs
diff --git a/Repository.mk b/Repository.mk
index 175fa1c..fa70f99 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -73,7 +73,7 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
swd \
swui \
textconversiondlgs \
- tk \
+ ootk \
tl \
utl \
unordf \
diff --git a/drawinglayer/Library_drawinglayer.mk b/drawinglayer/Library_drawinglayer.mk
index 9835890..ea05003 100644
--- a/drawinglayer/Library_drawinglayer.mk
+++ b/drawinglayer/Library_drawinglayer.mk
@@ -56,7 +56,7 @@ $(eval $(call gb_Library_add_linked_libs,drawinglayer,\
stl \
svl \
svt \
- tk \
+ ootk \
tl \
vcl \
$(gb_STDLIBS) \
diff --git a/editeng/Library_editeng.mk b/editeng/Library_editeng.mk
index 3e6f098..8044420 100755
--- a/editeng/Library_editeng.mk
+++ b/editeng/Library_editeng.mk
@@ -140,7 +140,7 @@ $(eval $(call gb_Library_add_linked_libs,editeng,\
basegfx \
lng \
svt \
- tk \
+ ootk \
vcl \
svl \
stl \
diff --git a/framework/Library_fwi.mk b/framework/Library_fwi.mk
index 44a0ca2..a2ec6a2 100644
--- a/framework/Library_fwi.mk
+++ b/framework/Library_fwi.mk
@@ -49,7 +49,7 @@ $(eval $(call gb_Library_add_linked_libs,fwi,\
stl \
svl \
svt \
- tk \
+ ootk \
tl \
utl \
vcl \
diff --git a/framework/Library_fwk.mk b/framework/Library_fwk.mk
index d541867..053c1c0 100644
--- a/framework/Library_fwk.mk
+++ b/framework/Library_fwk.mk
@@ -49,7 +49,7 @@ $(eval $(call gb_Library_add_linked_libs,fwk,\
stl \
svl \
svt \
- tk \
+ ootk \
tl \
ucbhelper \
utl \
diff --git a/framework/Library_fwl.mk b/framework/Library_fwl.mk
index 3347c7c..e7b285a 100644
--- a/framework/Library_fwl.mk
+++ b/framework/Library_fwl.mk
@@ -46,7 +46,7 @@ $(eval $(call gb_Library_add_linked_libs,fwl,\
stl \
svl \
svt \
- tk \
+ ootk \
tl \
utl \
vcl \
diff --git a/framework/Library_fwm.mk b/framework/Library_fwm.mk
index f42f190..4939ee9 100644
--- a/framework/Library_fwm.mk
+++ b/framework/Library_fwm.mk
@@ -44,7 +44,7 @@ $(eval $(call gb_Library_add_linked_libs,fwm,\
stl \
svl \
svt \
- tk \
+ ootk \
tl \
utl \
vcl \
diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index ed2fd0f..dab775b 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -90,7 +90,7 @@ my_components = \
component/sw/util/sw \
component/sw/util/swd \
component/sw/util/vbaswobj \
- component/toolkit/util/tk \
+ component/toolkit/util/ootk \
component/unoxml/source/rdf/unordf \
component/unoxml/source/service/unoxml \
component/xmloff/source/transform/xof \
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 759ecab..c5ea844 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -1503,7 +1503,7 @@ SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Wininetbe, wininetbe1.uno )
SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Macbe, macbe1.uno )
#endif
-STD_LIB_FILE( gid_File_Lib_Tk, tk )
+STD_LIB_FILE( gid_File_Lib_Tk, ootk )
STD_LIB_FILE( gid_File_Lib_Acc, acc )
STD_LIB_FILE( gid_File_Lib_Tools, tl )
diff --git a/scp2/source/sdkoo/sdkoo.scp b/scp2/source/sdkoo/sdkoo.scp
old mode 100644
new mode 100755
index 6ad99b5..48e2e2c
--- a/scp2/source/sdkoo/sdkoo.scp
+++ b/scp2/source/sdkoo/sdkoo.scp
@@ -43,25 +43,15 @@ End
#ifndef MACOSX
#ifdef WNT
-Directory gid_Dir_Sdkoo_Root
+Directory gid_Dir_OpenOffice_Sdk
ParentID = PREDEFINED_PROGDIR;
HostName = "${PRODUCTNAME}_${PRODUCTVERSION}_${POSTVERSIONEXTENSION}";
Styles = (OFFICEDIRECTORY, ISINSTALLLOCATION);
End
-#endif
-
-#ifndef WNT
-Directory gid_Dir_Ooo_Openofficeorg_Sdk
+#else
+Directory gid_Dir_OpenOffice_Sdk
ParentID = PREDEFINED_PROGDIR;
- HostName = "${UNIXBASISROOTNAME}";
-End
-#endif
-
-#ifndef WNT
-Directory gid_Dir_Ooo_Basis_Sdk
- ParentID = gid_Dir_Ooo_Openofficeorg_Sdk;
- HostName = "basis${OOOBASEVERSION}";
- Styles = (BASISDIRECTORY);
+ HostName = "${UNIXPRODUCTNAME}${BRANDPACKAGEVERSION}";
End
#endif
@@ -72,11 +62,7 @@ Directory gid_Dir_Basis_Sdk
ParentID = PREDEFINED_PROGDIR;
DosName = "OpenOffice_SDK";
#else
- #if defined WNT
- ParentID = gid_Dir_Sdkoo_Root;
- #else
- ParentID = gid_Dir_Ooo_Basis_Sdk;
- #endif
+ ParentID = gid_Dir_OpenOffice_Sdk;
DosName = "sdk";
#endif
End
@@ -183,7 +169,7 @@ Unixlink gid_Unixlink_Sal_Link_Sdk
Styles = ();
Name = SCP2_URE_DL_UNO_NORMAL("sal");
Dir = gid_Dir_Lib_Sdk;
- Target = "../../ure-link/lib/" SCP2_URE_DL_UNO_VER("sal", "3");
+ Target = "../../program/" SCP2_URE_DL_UNO_VER("sal", "3");
End
#endif
@@ -193,7 +179,7 @@ Unixlink gid_Unixlink_Salhelper_Link_Sdk
Styles = ();
Name = SCP2_URE_DL_UNO_COMID_NORMAL("salhelper");
Dir = gid_Dir_Lib_Sdk;
- Target = "../../ure-link/lib/" SCP2_URE_DL_UNO_COMID_VER("salhelper", "3");
+ Target = "../../program/" SCP2_URE_DL_UNO_COMID_VER("salhelper", "3");
End
#endif
@@ -203,7 +189,7 @@ Unixlink gid_Unixlink_Cppu_Link_Sdk
Styles = ();
Name = SCP2_URE_DL_UNO_NORMAL("cppu");
Dir = gid_Dir_Lib_Sdk;
- Target = "../../ure-link/lib/" SCP2_URE_DL_UNO_VER("cppu", "3");
+ Target = "../../program/" SCP2_URE_DL_UNO_VER("cppu", "3");
End
#endif
@@ -214,7 +200,7 @@ Unixlink gid_Unixlink_Cppuhelper_Link_Sdk
// Styles = (LAYERLINK);
Name = SCP2_URE_DL_UNO_COMID_NORMAL("cppuhelper");
Dir = gid_Dir_Lib_Sdk;
- Target = "../../ure-link/lib/" SCP2_URE_DL_UNO_COMID_VER("cppuhelper", "3");
+ Target = "../../program/" SCP2_URE_DL_UNO_COMID_VER("cppuhelper", "3");
End
#endif
@@ -224,7 +210,7 @@ Unixlink gid_Unixlink_Purpenvhelper_Link_Sdk
Styles = ();
Name = SCP2_URE_DL_UNO_COMID_NORMAL("purpenvhelper");
Dir = gid_Dir_Lib_Sdk;
- Target = "../../ure-link/lib/" SCP2_URE_DL_UNO_COMID_VER("purpenvhelper", "3");
+ Target = "../../program/" SCP2_URE_DL_UNO_COMID_VER("purpenvhelper", "3");
End
#endif
diff --git a/sfx2/Library_qstart.mk b/sfx2/Library_qstart.mk
index 06d98e7..64b2a3e 100755
--- a/sfx2/Library_qstart.mk
+++ b/sfx2/Library_qstart.mk
@@ -68,7 +68,7 @@ $(eval $(call gb_Library_add_linked_libs,qstart_gtk,\
stl \
svl \
svt \
- tk \
+ ootk \
tl \
ucbhelper \
utl \
diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk
index 7695d47..5341571 100755
--- a/sfx2/Library_sfx.mk
+++ b/sfx2/Library_sfx.mk
@@ -65,7 +65,7 @@ $(eval $(call gb_Library_add_linked_libs,sfx,\
stl \
svl \
svt \
- tk \
+ ootk \
tl \
ucbhelper \
utl \
diff --git a/solenv/inc/libs.mk b/solenv/inc/libs.mk
index 154bb28..6bba5db 100644
--- a/solenv/inc/libs.mk
+++ b/solenv/inc/libs.mk
@@ -166,7 +166,7 @@ AGGLIB=-lagg$(DLLPOSTFIX)
.ENDIF
FREETYPE_LIBS*=-lfreetype
FREETYPELIB=$(FREETYPE_LIBS)
-TKLIB=-ltk$(DLLPOSTFIX)
+TKLIB=-lootk$(DLLPOSTFIX)
LAYOUTLIB=-ltklayout$(DLLPOSTFIX)
SVTOOLLIB=-lsvt$(DLLPOSTFIX)
XMLSECLIB=-lxmlsec1
@@ -463,7 +463,7 @@ CPPCANVASLIB=icppcanvas.lib
FORLIB=ifor.lib
FORUILIB=iforui.lib
AGGLIB=iagg.lib
-TKLIB=itk.lib
+TKLIB=iootk.lib
LAYOUTLIB=itklayout.lib
SVXLLIB=svxl.lib
FREETYPELIB=freetype.lib
diff --git a/svtools/Library_hatchwindowfactory.mk b/svtools/Library_hatchwindowfactory.mk
index 0029b9a..a4db370 100644
--- a/svtools/Library_hatchwindowfactory.mk
+++ b/svtools/Library_hatchwindowfactory.mk
@@ -40,7 +40,7 @@ $(eval $(call gb_Library_add_linked_libs,hatchwindowfactory,\
cppu \
cppuhelper \
sal \
- tk \
+ ootk \
tl \
vcl \
stl \
diff --git a/svtools/Library_svt.mk b/svtools/Library_svt.mk
index cf84b46..dbdfe74 100644
--- a/svtools/Library_svt.mk
+++ b/svtools/Library_svt.mk
@@ -60,7 +60,7 @@ $(eval $(call gb_Library_add_linked_libs,svt,\
sot \
stl \
svl \
- tk \
+ ootk \
tl \
ucbhelper \
utl \
diff --git a/svx/Library_svx.mk b/svx/Library_svx.mk
index 56fab42..05aa22e 100644
--- a/svx/Library_svx.mk
+++ b/svx/Library_svx.mk
@@ -58,7 +58,7 @@ $(eval $(call gb_Library_add_linked_libs,svx,\
svl \
svt \
svxcore \
- tk \
+ ootk \
tl \
ucbhelper \
utl \
diff --git a/svx/Library_svxcore.mk b/svx/Library_svxcore.mk
index 8b212fd..24bdc0a 100644
--- a/svx/Library_svxcore.mk
+++ b/svx/Library_svxcore.mk
@@ -72,7 +72,7 @@ $(eval $(call gb_Library_add_linked_libs,svxcore,\
stl \
svl \
svt \
- tk \
+ ootk \
tl \
ucbhelper \
utl \
diff --git a/svx/Library_textconversiondlgs.mk b/svx/Library_textconversiondlgs.mk
index ea1c37a..ada10b5 100644
--- a/svx/Library_textconversiondlgs.mk
+++ b/svx/Library_textconversiondlgs.mk
@@ -43,8 +43,8 @@ $(eval $(call gb_Library_add_linked_libs,textconversiondlgs,\
sal \
svl \
svt \
- stl \
- tk \
+ stl \
+ ootk \
tl \
utl \
vcl \
diff --git a/sw/Library_msword.mk b/sw/Library_msword.mk
index 5aa0150..1b73a0f 100644
--- a/sw/Library_msword.mk
+++ b/sw/Library_msword.mk
@@ -62,7 +62,7 @@ $(eval $(call gb_Library_add_linked_libs,msword,\
svx \
svxcore \
sw \
- tk \
+ ootk \
tl \
ucbhelper \
utl \
diff --git a/sw/Library_sw.mk b/sw/Library_sw.mk
index b5b9297..54cb0a4 100644
--- a/sw/Library_sw.mk
+++ b/sw/Library_sw.mk
@@ -69,7 +69,7 @@ $(eval $(call gb_Library_add_linked_libs,sw,\
svt \
svx \
svxcore \
- tk \
+ ootk \
tl \
ucbhelper \
utl \
diff --git a/sw/Library_swui.mk b/sw/Library_swui.mk
index 94d6f71..42100d5 100644
--- a/sw/Library_swui.mk
+++ b/sw/Library_swui.mk
@@ -56,7 +56,7 @@ $(eval $(call gb_Library_add_linked_libs,swui,\
svx \
svxcore \
sw \
- tk \
+ ootk \
tl \
ucbhelper \
utl \
diff --git a/sw/Library_vbaswobj.mk b/sw/Library_vbaswobj.mk
index 68214d0..496f956 100644
--- a/sw/Library_vbaswobj.mk
+++ b/sw/Library_vbaswobj.mk
@@ -52,7 +52,7 @@ $(eval $(call gb_Library_add_linked_libs,vbaswobj,\
svx \
svxcore \
sw \
- tk \
+ ootk \
tl \
utl \
vbahelper \
diff --git a/toolkit/Library_tk.mk b/toolkit/Library_tk.mk
index 275a9a0..65b2020 100644
--- a/toolkit/Library_tk.mk
+++ b/toolkit/Library_tk.mk
@@ -21,15 +21,15 @@
-$(eval $(call gb_Library_Library,tk))
+$(eval $(call gb_Library_Library,ootk))
-$(eval $(call gb_Library_set_componentfile,tk,toolkit/util/tk))
+$(eval $(call gb_Library_set_componentfile,ootk,toolkit/util/ootk))
-$(eval $(call gb_Library_add_package_headers,tk,toolkit_inc))
+$(eval $(call gb_Library_add_package_headers,ootk,toolkit_inc))
-#$(eval $(call gb_Library_add_precompiled_header,tk,$(SRCDIR)/toolkit/inc/pch/precompiled_toolkit))
+#$(eval $(call gb_Library_add_precompiled_header,ootk,$(SRCDIR)/toolkit/inc/pch/precompiled_toolkit))
-$(eval $(call gb_Library_set_include,tk,\
+$(eval $(call gb_Library_set_include,ootk,\
$$(INCLUDE) \
-I$(SRCDIR)/toolkit/inc \
-I$(SRCDIR)/toolkit/inc/pch \
@@ -37,12 +37,12 @@ $(eval $(call gb_Library_set_include,tk,\
-I$(OUTDIR)/inc/offuh \
))
-$(eval $(call gb_Library_set_defs,tk,\
+$(eval $(call gb_Library_set_defs,ootk,\
$$(DEFS) \
-DTOOLKIT_DLLIMPLEMENTATION \
))
-$(eval $(call gb_Library_add_linked_libs,tk,\
+$(eval $(call gb_Library_add_linked_libs,ootk,\
comphelper \
cppu \
cppuhelper \
@@ -54,7 +54,7 @@ $(eval $(call gb_Library_add_linked_libs,tk,\
$(gb_STDLIBS) \
))
-$(eval $(call gb_Library_add_exception_objects,tk,\
+$(eval $(call gb_Library_add_exception_objects,ootk,\
toolkit/source/awt/asynccallback \
toolkit/source/awt/stylesettings \
toolkit/source/awt/vclxaccessiblecomponent \
@@ -152,12 +152,12 @@ $(eval $(call gb_Library_add_exception_objects,tk,\
))
ifeq ($(GUIBASE),aqua)
-$(eval $(call gb_Library_set_cxxflags,tk,\
+$(eval $(call gb_Library_set_cxxflags,ootk,\
$$(CXXFLAGS) $(gb_OBJCXXFLAGS)))
endif
ifeq ($(OS),LINUX)
-$(eval $(call gb_Library_add_linked_libs,tk,\
+$(eval $(call gb_Library_add_linked_libs,ootk,\
X11 \
))
endif
diff --git a/toolkit/util/ootk.component b/toolkit/util/ootk.component
new file mode 100644
index 0000000..1bb411d
--- /dev/null
+++ b/toolkit/util/ootk.component
@@ -0,0 +1,302 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--***********************************************************
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ ***********************************************************-->
+
+
+
+<component loader="com.sun.star.loader.SharedLibrary"
+ xmlns="http://openoffice.org/2010/uno-components">
+ <implementation name="com.sun.star.awt.comp.AsyncCallback">
+ <service name="com.sun.star.awt.AsyncCallback"/>
+ </implementation>
+ <implementation name="com.sun.star.comp.awt.Layout">
+ <service name="com.sun.star.awt.Layout"/>
+ <service name="com.sun.star.comp.awt.Layout"/>
+ </implementation>
+ <implementation name="stardiv.Toolkit.UnoControlTabPage">
+ <service name="com.sun.star.awt.tab.UnoControlTabPage"/>
+ </implementation>
+ <implementation name="stardiv.Toolkit.UnoControlTabPageModel">
+ <service name="com.sun.star.awt.tab.UnoControlTabPageModel"/>
+ </implementation>
+ <implementation name="stardiv.Toolkit.UnoControlTabPageContainerModel">
+ <service name="com.sun.star.awt.tab.UnoControlTabPageContainerModel"/>
+ </implementation>
+ <implementation name="stardiv.Toolkit.UnoControlTabPageContainer">
+ <service name="com.sun.star.awt.tab.UnoControlTabPageContainer"/>
+ </implementation>
+ <implementation name="stardiv.Toolkit.DefaultGridColumnModel">
+ <service name="com.sun.star.awt.grid.DefaultGridColumnModel"/>
+ </implementation>
+ <implementation name="stardiv.Toolkit.DefaultGridDataModel">
+ <service name="com.sun.star.awt.grid.DefaultGridDataModel"/>
+ </implementation>
+ <implementation name="org.openoffice.comp.toolkit.GridColumn">
+ <service name="com.sun.star.awt.grid.GridColumn"/>
+ </implementation>
+ <implementation name="org.openoffice.comp.toolkit.SortableGridDataModel">
+ <service name="com.sun.star.awt.grid.SortableGridDataModel"/>
+ </implementation>
+ <implementation name="stardiv.Toolkit.GridControl">
+ <service name="com.sun.star.awt.grid.UnoControlGrid"/>
+ </implementation>
+ <implementation name="stardiv.Toolkit.GridControlModel">
+ <service name="com.sun.star.awt.grid.UnoControlGridModel"/>
+ </implementation>
+ <implementation name="stardiv.Toolkit.MutableTreeDataModel">
+ <service name="com.sun.star.awt.tree.MutableTreeDataModel"/>
+ </implementation>
+ <implementation name="stardiv.Toolkit.StdTabController">
+ <service name="com.sun.star.awt.TabController"/>
+ <service name="stardiv.vcl.control.TabController"/>
+ </implementation>
+ <implementation name="stardiv.Toolkit.StdTabControllerModel">
+ <service name="com.sun.star.awt.TabControllerModel"/>
+ <service name="stardiv.vcl.controlmodel.TabController"/>
+ </implementation>
+ <implementation name="stardiv.Toolkit.TreeControl">
+ <service name="com.sun.star.awt.tree.TreeControl"/>
+ </implementation>
+ <implementation name="stardiv.Toolkit.TreeControlModel">
+ <service name="com.sun.star.awt.tree.TreeControlModel"/>
+ </implementation>
+ <implementation name="stardiv.Toolkit.UnoButtonControl">
+ <service name="com.sun.star.awt.UnoControlButton"/>
+ <service name="stardiv.vcl.control.Button"/>
+ </implementation>
+ <implementation name="stardiv.Toolkit.UnoCheckBoxControl">
+ <service name="com.sun.star.awt.UnoControlCheckBox"/>
+ <service name="stardiv.vcl.control.CheckBox"/>
+ </implementation>
+ <implementation name="stardiv.Toolkit.UnoComboBoxControl">
+ <service name="com.sun.star.awt.UnoControlComboBox"/>
+ <service name="stardiv.vcl.control.ComboBox"/>
+ </implementation>
+ <implementation name="stardiv.Toolkit.UnoControlButtonModel">
+ <service name="com.sun.star.awt.UnoControlButtonModel"/>
+ <service name="stardiv.vcl.controlmodel.Button"/>
+ </implementation>
+ <implementation name="stardiv.Toolkit.UnoControlCheckBoxModel">
+ <service name="com.sun.star.awt.UnoControlCheckBoxModel"/>
+ <service name="stardiv.vcl.controlmodel.CheckBox"/>
+ </implementation>
+ <implementation name="stardiv.Toolkit.UnoControlComboBoxModel">
+ <service name="com.sun.star.awt.UnoControlComboBoxModel"/>
+ <service name="stardiv.vcl.controlmodel.ComboBox"/>
+ </implementation>
+ <implementation name="stardiv.Toolkit.UnoControlContainer">
+ <service name="com.sun.star.awt.UnoControlContainer"/>
+ <service name="stardiv.vcl.control.ControlContainer"/>
+ </implementation>
+ <implementation name="stardiv.Toolkit.UnoControlContainerModel">
+ <service name="com.sun.star.awt.UnoControlContainerModel"/>
+ <service name="stardiv.vcl.controlmodel.ControlContainer"/>
+ </implementation>
+ <implementation name="stardiv.Toolkit.UnoControlCurrencyFieldModel">
+ <service name="com.sun.star.awt.UnoControlCurrencyFieldModel"/>
+ <service name="stardiv.vcl.controlmodel.CurrencyField"/>
+ </implementation>
+ <implementation name="stardiv.Toolkit.UnoControlDateFieldModel">
+ <service name="com.sun.star.awt.UnoControlDateFieldModel"/>
+ <service name="stardiv.vcl.controlmodel.DateField"/>
+ </implementation>
+ <implementation name="stardiv.Toolkit.UnoControlDialogModel">
+ <service name="com.sun.star.awt.UnoControlDialogModel"/>
+ <service name="stardiv.vcl.controlmodel.Dialog"/>
+ </implementation>
+ <implementation name="stardiv.Toolkit.UnoControlEditModel">
+ <service name="com.sun.star.awt.UnoControlEditModel"/>
+ <service name="stardiv.vcl.controlmodel.Edit"/>
+ </implementation>
+ <implementation name="stardiv.Toolkit.UnoControlFileControlModel">
+ <service name="com.sun.star.awt.UnoControlFileControlModel"/>
+ <service name="stardiv.vcl.controlmodel.FileControl"/>
+ </implementation>
+ <implementation name="stardiv.Toolkit.UnoControlFixedHyperlinkModel">
+ <service name="com.sun.star.awt.UnoControlFixedHyperlinkModel"/>
+ </implementation>
+ <implementation name="stardiv.Toolkit.UnoControlFixedLineModel">
+ <service name="com.sun.star.awt.UnoControlFixedLineModel"/>
+ <service name="stardiv.vcl.controlmodel.FixedLine"/>
+ </implementation>
+ <implementation name="stardiv.Toolkit.UnoControlFixedTextModel">
+ <service name="com.sun.star.awt.UnoControlFixedTextModel"/>
+ <service name="stardiv.vcl.controlmodel.FixedText"/>
+ </implementation>
+ <implementation name="stardiv.Toolkit.UnoControlFormattedFieldModel">
+ <service name="com.sun.star.awt.UnoControlFormattedFieldModel"/>
+ <service name="stardiv.vcl.controlmodel.FormattedField"/>
+ </implementation>
+ <implementation name="stardiv.Toolkit.UnoControlGroupBoxModel">
+ <service name="com.sun.star.awt.UnoControlGroupBoxModel"/>
+ <service name="stardiv.vcl.controlmodel.GroupBox"/>
+ </implementation>
+ <implementation name="stardiv.Toolkit.UnoControlImageControlModel">
+ <service name="com.sun.star.awt.UnoControlImageButtonModel"/>
+ <service name="com.sun.star.awt.UnoControlImageControlModel"/>
+ <service name="stardiv.vcl.controlmodel.ImageButton"/>
+ <service name="stardiv.vcl.controlmodel.ImageControl"/>
+ </implementation>
+ <implementation name="stardiv.Toolkit.UnoControlListBoxModel">
+ <service name="com.sun.star.awt.UnoControlListBoxModel"/>
+ <service name="stardiv.vcl.controlmodel.ListBox"/>
+ </implementation>
+ <implementation name="stardiv.Toolkit.UnoControlNumericFieldModel">
+ <service name="com.sun.star.awt.UnoControlNumericFieldModel"/>
+ <service name="stardiv.vcl.controlmodel.NumericField"/>
+ </implementation>
+ <implementation name="stardiv.Toolkit.UnoControlPatternFieldModel">
+ <service name="com.sun.star.awt.UnoControlPatternFieldModel"/>
+ <service name="stardiv.vcl.controlmodel.PatternField"/>
+ </implementation>
+ <implementation name="stardiv.Toolkit.UnoControlProgressBarModel">
+ <service name="com.sun.star.awt.UnoControlProgressBarModel"/>
+ <service name="stardiv.vcl.controlmodel.ProgressBar"/>
+ </implementation>
+ <implementation name="stardiv.Toolkit.UnoControlRadioButtonModel">
+ <service name="com.sun.star.awt.UnoControlRadioButtonModel"/>
+ <service name="stardiv.vcl.controlmodel.RadioButton"/>
+ </implementation>
+ <implementation name="stardiv.Toolkit.UnoControlRoadmapModel">
+ <service name="com.sun.star.awt.UnoControlRoadmapModel"/>
+ <service name="stardiv.vcl.controlmodel.Roadmap"/>
+ </implementation>
+ <implementation name="stardiv.Toolkit.UnoControlScrollBarModel">
+ <service name="com.sun.star.awt.UnoControlScrollBarModel"/>
+ <service name="stardiv.vcl.controlmodel.ScrollBar"/>
+ </implementation>
+ <implementation name="stardiv.Toolkit.UnoControlTimeFieldModel">
+ <service name="com.sun.star.awt.UnoControlTimeFieldModel"/>
+ <service name="stardiv.vcl.controlmodel.TimeField"/>
+ </implementation>
+ <implementation name="stardiv.Toolkit.UnoCurrencyFieldControl">
+ <service name="com.sun.star.awt.UnoControlCurrencyField"/>
+ <service name="stardiv.vcl.control.CurrencyField"/>
+ </implementation>
+ <implementation name="stardiv.Toolkit.UnoDateFieldControl">
+ <service name="com.sun.star.awt.UnoControlDateField"/>
+ <service name="stardiv.vcl.control.DateField"/>
+ </implementation>
+ <implementation name="stardiv.Toolkit.UnoDialogControl">
+ <service name="com.sun.star.awt.UnoControlDialog"/>
+ <service name="stardiv.vcl.control.Dialog"/>
+ </implementation>
+ <implementation name="stardiv.Toolkit.UnoEditControl">
+ <service name="com.sun.star.awt.UnoControlEdit"/>
+ <service name="stardiv.vcl.control.Edit"/>
+ </implementation>
+ <implementation name="stardiv.Toolkit.UnoFileControl">
+ <service name="com.sun.star.awt.UnoControlFileControl"/>
+ <service name="stardiv.vcl.control.FileControl"/>
+ </implementation>
+ <implementation name="stardiv.Toolkit.UnoFixedHyperlinkControl">
+ <service name="com.sun.star.awt.UnoControlFixedHyperlink"/>
+ </implementation>
+ <implementation name="stardiv.Toolkit.UnoFixedLineControl">
+ <service name="com.sun.star.awt.UnoControlFixedLine"/>
+ <service name="stardiv.vcl.control.FixedLine"/>
+ </implementation>
+ <implementation name="stardiv.Toolkit.UnoFixedTextControl">
+ <service name="com.sun.star.awt.UnoControlFixedText"/>
+ <service name="stardiv.vcl.control.FixedText"/>
+ </implementation>
+ <implementation name="stardiv.Toolkit.UnoFormattedFieldControl">
+ <service name="com.sun.star.awt.UnoControlFormattedField"/>
+ <service name="stardiv.vcl.control.FormattedField"/>
+ </implementation>
+ <implementation name="stardiv.Toolkit.UnoGroupBoxControl">
+ <service name="com.sun.star.awt.UnoControlGroupBox"/>
+ <service name="stardiv.vcl.control.GroupBox"/>
+ </implementation>
+ <implementation name="stardiv.Toolkit.UnoImageControlControl">
+ <service name="com.sun.star.awt.UnoControlImageButton"/>
+ <service name="com.sun.star.awt.UnoControlImageControl"/>
+ <service name="stardiv.vcl.control.ImageButton"/>
+ <service name="stardiv.vcl.control.ImageControl"/>
+ </implementation>
+ <implementation name="stardiv.Toolkit.UnoListBoxControl">
+ <service name="com.sun.star.awt.UnoControlListBox"/>
+ <service name="stardiv.vcl.control.ListBox"/>
+ </implementation>
+ <implementation name="stardiv.Toolkit.UnoNumericFieldControl">
+ <service name="com.sun.star.awt.UnoControlNumericField"/>
+ <service name="stardiv.vcl.control.NumericField"/>
+ </implementation>
+ <implementation name="stardiv.Toolkit.UnoPatternFieldControl">
+ <service name="com.sun.star.awt.UnoControlPatternField"/>
+ <service name="stardiv.vcl.control.PatternField"/>
+ </implementation>
+ <implementation name="stardiv.Toolkit.UnoProgressBarControl">
+ <service name="com.sun.star.awt.UnoControlProgressBar"/>
+ <service name="stardiv.vcl.control.ProgressBar"/>
+ </implementation>
+ <implementation name="stardiv.Toolkit.UnoRadioButtonControl">
+ <service name="com.sun.star.awt.UnoControlRadioButton"/>
+ <service name="stardiv.vcl.control.RadioButton"/>
+ </implementation>
+ <implementation name="stardiv.Toolkit.UnoRoadmapControl">
+ <service name="com.sun.star.awt.UnoControlRoadmap"/>
+ <service name="stardiv.vcl.control.Roadmap"/>
+ </implementation>
+ <implementation name="stardiv.Toolkit.UnoScrollBarControl">
+ <service name="com.sun.star.awt.UnoControlScrollBar"/>
+ <service name="stardiv.vcl.control.ScrollBar"/>
+ </implementation>
+ <implementation name="org.openoffice.comp.toolkit.SpinningProgressControlModel">
+ <service name="com.sun.star.awt.SpinningProgressControlModel"/>
+ </implementation>
+ <implementation name="org.openoffice.comp.toolkit.AnimatedImagesControlModel">
+ <service name="com.sun.star.awt.AnimatedImagesControlModel"/>
+ </implementation>
+ <implementation name="org.openoffice.comp.toolkit.AnimatedImagesControl">
+ <service name="com.sun.star.awt.AnimatedImagesControl"/>
+ </implementation>
+ <implementation name="stardiv.Toolkit.UnoSpinButtonControl">
+ <service name="com.sun.star.awt.UnoControlSpinButton"/>
+ </implementation>
+ <implementation name="stardiv.Toolkit.UnoSpinButtonModel">
+ <service name="com.sun.star.awt.UnoControlSpinButtonModel"/>
+ </implementation>
+ <implementation name="stardiv.Toolkit.UnoTimeFieldControl">
+ <service name="com.sun.star.awt.UnoControlTimeField"/>
+ <service name="stardiv.vcl.control.TimeField"/>
+ </implementation>
+ <implementation name="stardiv.Toolkit.VCLXMenuBar">
+ <service name="com.sun.star.awt.MenuBar"/>
+ <service name="stardiv.vcl.MenuBar"/>
+ </implementation>
+ <implementation name="stardiv.Toolkit.VCLXPointer">
+ <service name="com.sun.star.awt.Pointer"/>
+ <service name="stardiv.vcl.Pointer"/>
+ </implementation>
+ <implementation name="stardiv.Toolkit.VCLXPopupMenu">
+ <service name="com.sun.star.awt.PopupMenu"/>
+ <service name="stardiv.vcl.PopupMenu"/>
+ </implementation>
+ <implementation name="stardiv.Toolkit.VCLXPrinterServer">
+ <service name="com.sun.star.awt.PrinterServer"/>
+ <service name="stardiv.vcl.PrinterServer"/>
+ </implementation>
+ <implementation name="stardiv.Toolkit.VCLXToolkit">
+ <service name="com.sun.star.awt.Toolkit"/>
+ <service name="stardiv.vcl.VclToolkit"/>
+ </implementation>
+</component>
diff --git a/vbahelper/Library_msforms.mk b/vbahelper/Library_msforms.mk
index 9f2834b..5b2342b 100755
--- a/vbahelper/Library_msforms.mk
+++ b/vbahelper/Library_msforms.mk
@@ -53,7 +53,7 @@ $(eval $(call gb_Library_add_linked_libs,msforms,\
svt \
svx \
stl \
- tk \
+ ootk \
tl \
vbahelper \
vcl \
diff --git a/vbahelper/Library_vbahelper.mk b/vbahelper/Library_vbahelper.mk
index a36fa3b..775a365 100755
--- a/vbahelper/Library_vbahelper.mk
+++ b/vbahelper/Library_vbahelper.mk
@@ -56,7 +56,7 @@ $(eval $(call gb_Library_add_linked_libs,vbahelper,\
stl \
svl \
svt \
- tk \
+ ootk \
tl \
utl \
vcl \
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index 62e344c..eab3663 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -1728,7 +1728,7 @@ UnoWrapperBase* Application::GetUnoWrapper( sal_Bool bCreateIfNotExist )
static sal_Bool bAlreadyTriedToCreate = sal_False;
if ( !pSVData->mpUnoWrapper && bCreateIfNotExist && !bAlreadyTriedToCreate )
{
- ::rtl::OUString aLibName = ::vcl::unohelper::CreateLibraryName( "tk", sal_True );
+ ::rtl::OUString aLibName = ::vcl::unohelper::CreateLibraryName( "ootk", sal_True );
oslModule hTkLib = osl_loadModuleRelative(
&thisModule, aLibName.pData, SAL_LOADMODULE_DEFAULT );
if ( hTkLib )
commit 1deb4e880ad5e6daf64dde007dcc09d9d2737884
Author: Jürgen Schmidt <jsc at apache.org>
Date: Fri May 31 07:23:17 2013 +0000
#122356# adapt SDK config etc. to 3layer changes
diff --git a/odk/cfgWin.js b/odk/cfgWin.js
index 7bf53ca..53dd180 100644
--- a/odk/cfgWin.js
+++ b/odk/cfgWin.js
@@ -37,7 +37,7 @@ var regKeyVC90 = "HKLM\\SOFTWARE\\Microsoft\\VisualStudio\\9.0\\Setup\\VC\\Produ
//var regKeyVCExpress80 = "HKLM\\SOFTWARE\\Microsoft\\VCExpress\\8.0\\Setup\\VC\\ProductDir";
var regKeyVCExpress90 = "HKLM\\SOFTWARE\\Microsoft\\VCExpress\\9.0\\Setup\\VC\\ProductDir";
-
+var regKeyVCExpress90_2 = "HKLM\\SOFTWARE\\Wow6432Node\\Microsoft\\VCExpress\\9.0\\Setup\\VC\\ProductDir";
var regKeyWindowsSDK = "HKLM\\SOFTWARE\\Microsoft\\Microsoft SDKs\\Windows\\CurrentInstallFolder";
var WshShell = WScript.CreateObject("WScript.Shell");
@@ -510,11 +510,17 @@ function getCppHome()
}catch (exc) {}
if (sVC.length == 0)
{
- try {
- sVC = WshShell.RegRead(regKeyVC90);
- }catch (exc) {}
- }
- // check Windows SDK if VC 9
+ try {
+ sVC = WshShell.RegRead(regKeyVCExpress90_2);
+ }catch (exc) {}
+ }
+ if (sVC.length == 0)
+ {
+ try {
+ sVC = WshShell.RegRead(regKeyVC90);
+ }catch (exc) {}
+ }
+ // check Windows SDK if VC 9
if (sVC.length > 0)
{
oo_sdk_manifest_used="true";
@@ -919,67 +925,60 @@ 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 +
+ "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\\Basic 4.0\\sdk\n" +
- "set OO_SDK_HOME=" + oo_sdk_home +
+ "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\\Basis 4.0\n" +
- "set OFFICE_BASE_HOME=" + office_base_home +
- "\n\n" +
- "REM URE installation directory.\n" +
- "REM Example: set OO_SDK_URE_HOME=C:\\Program Files\\OpenOffice\\URE\n" +
- "set OO_SDK_URE_HOME=" + oo_sdk_ure_home +
+ "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=D:\\NextGenerationMake\\make\n" +
- "set OO_SDK_MAKE_HOME=" + oo_sdk_make_home +
+ "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=D:\\infozip\\bin\n" +
- "set OO_SDK_ZIP_HOME=" + oo_sdk_zip_home +
+ "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 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 +
+ "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 +
+ "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 +
- "\nset CPP_MANIFEST=" + oo_sdk_manifest_used +
- "\nset CPP_WINDOWS_SDK=" + oo_sdk_windowssdk +
+ "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 +
+ "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 +
+ "@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 +
+ "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 +
+ "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" +
+ "@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" +
"if not defined OO_SDK_HOME (\n" +
" echo Error: the variable OO_SDK_HOME is missing!\n" +
@@ -1020,79 +1019,55 @@ 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" +
- " )\n" +
+ " @set OFFICE_PROGRAM_PATH=%OFFICE_HOME%\\program\n" +
+ " )" +
"\n" +
- "REM Set office program path.\n" +
- "if defined OFFICE_BASE_HOME (\n" +
- " set OFFICE_BASE_PROGRAM_PATH=%OFFICE_BASE_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" +
+ " )\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" +
- " )\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" +
- "REM if defined OO_SDK_URE_HOME (\n" +
- "set OO_SDK_URE_BIN_DIR=%OO_SDK_URE_HOME%\\bin\n" +
- "set OO_SDK_URE_LIB_DIR=%OO_SDK_URE_HOME%\\bin\n" +
- "set OO_SDK_URE_JAVA_DIR=%OO_SDK_URE_HOME%\\java\n" +
- "REM ) else (\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" +
+ "@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" +
"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" +
- "REM if defined OFFICE_HOME (\n" +
- "REM set CLASSPATH=%CLASSPATH%;%OO_SDK_OFFICE_JAVA_DIR%\\unoil.jar\n" +
- "REM )\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" +
"\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;%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" +
"\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 command make to the path, if necessary.\n" +
- "if defined OO_SDK_MAKE_HOME set PATH=%OO_SDK_MAKE_HOME%;%PATH%\n" +
- "\n" +
- "REM Add directory of the zip tool to the path, if necessary.\n" +
- "if defined OO_SDK_ZIP_HOME set PATH=%OO_SDK_ZIP_HOME%;%PATH%\n" +
- "\n" +
- "REM Add directory of the cat tool to the path, if necessary.\n" +
- "if defined OO_SDK_CAT_HOME set PATH=%OO_SDK_CAT_HOME%;%PATH%\n" +
- "\n" +
- "REM Add directory of the sed tool to the path, if necessary.\n" +
- "if defined OO_SDK_SED_HOME set PATH=%OO_SDK_SED_HOME%;%PATH%\n" +
- "\n" +
- "REM Add directory of the C++ compiler to the path, if necessary.\n" +
- "if defined OO_SDK_CPP_HOME set PATH=%OO_SDK_CPP_HOME%;%PATH%\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" +
@@ -1107,8 +1082,6 @@ function writeBatFile(fdir, file)
"echo *\n" +
"echo * SDK = %OO_SDK_HOME%\n" +
"echo * Office = %OFFICE_HOME%\n" +
- "echo * Office Base = %OFFICE_BASE_HOME%\n" +
- "echo * URE = %OO_SDK_URE_HOME%\n" +
"echo * Make = %OO_SDK_MAKE_HOME%\n" +
"echo * Zip = %OO_SDK_ZIP_HOME%\n" +
"echo * cat = %OO_SDK_CAT_HOME%\n" +
diff --git a/odk/configure.pl b/odk/configure.pl
index ac88c00..eee5324 100755
--- a/odk/configure.pl
+++ b/odk/configure.pl
@@ -43,23 +43,11 @@ $main::operatingSystem = `$main::sdkpath/config.guess | cut -d"-" -f3,4`;
chomp ($main::operatingSystem);
$main::OO_SDK_HOME = $main::sdkpath;
-#$main::OO_SDK_HOME = "";
$main::OO_SDK_HOME_SUGGESTION = $main::sdkpath;
-$main::OFFICE_OR_URE = "Office";
-$main::OFFICE_OR_URE_SUGGESTION = "Office";
-
$main::OFFICE_HOME = "";
-$main::OFFICE_BASE_HOME = substr($main::sdkpath, 0, rindex($main::sdkpath, "/sdk"));
-
-if ( $main::operatingSystem =~ m/darwin/ )
-{
-# $main::OO_SDK_URE_HOME = `cd $main::sdkpath/../ure-link && pwd`;
-} else {
- $main::OO_SDK_URE_HOME = `cd $main::sdkpath/../ure-link && pwd`;
-}
-chomp($main::OO_SDK_URE_HOME);
+#$main::OFFICE_BASE_HOME = substr($main::sdkpath, 0, rindex($main::sdkpath, "/sdk"));
$main::OO_SDK_MAKE_HOME = "";
$main::makeName = "make";
@@ -115,143 +103,106 @@ $main::skipOutputDir = 0;
$main::return = 0;
-if ( $main::OFFICE_OR_URE eq "Office" )
+if ( $main::operatingSystem =~ m/darwin/ )
{
- if ( $main::operatingSystem =~ m/darwin/ )
- {
# used for a SDK as part of the office installation
-# $main::OFFICE_HOME = `cd $main::sdkpath/../../.. && pwd`;
-# chomp($main::OFFICE_HOME);
-# print " Used Office = $main::OFFICE_HOME\n";
- print " Used SDK = $main::OO_SDK_HOME\n\n";
-
- $main::OFFICE_HOME_SUGGESTION = searchMacOffice();
- while ( (! -d "$main::OFFICE_HOME" ) ||
- ((-d "$main::OFFICE_HOME") && (! -d "$main::OFFICE_HOME/Contents/MacOS")) )
- {
- print " Enter the Office installation directory [$main::OFFICE_HOME_SUGGESTION]: ";
- $main::OFFICE_HOME = readStdIn();
- chop($main::OFFICE_HOME);
- if ( $main::OFFICE_HOME eq "" )
- {
- $main::OFFICE_HOME = $main::OFFICE_HOME_SUGGESTION;
- }
-
- if ( ! -d "$main::OFFICE_HOME" )
- {
- $main::OFFICE_HOME = "";
- print " Error: An office installation is required, please specify the path to a valid installation.\n";
- }
+# $main::OFFICE_HOME = `cd $main::sdkpath/../../.. && pwd`;
+# chomp($main::OFFICE_HOME);
+# print " Used Office = $main::OFFICE_HOME\n";
+ print " Used SDK = $main::OO_SDK_HOME\n\n";
+
+ $main::OFFICE_HOME_SUGGESTION = searchMacOffice();
+ while ( (! -d "$main::OFFICE_HOME" ) ||
+ ((-d "$main::OFFICE_HOME") && (! -d "$main::OFFICE_HOME/Contents/MacOS")) )
+ {
+ print " Enter the Office installation directory [$main::OFFICE_HOME_SUGGESTION]: ";
+ $main::OFFICE_HOME = readStdIn();
+ chop($main::OFFICE_HOME);
+ if ( $main::OFFICE_HOME eq "" )
+ {
+ $main::OFFICE_HOME = $main::OFFICE_HOME_SUGGESTION;
+ }
- # check more details
- if ( -d "$main::OFFICE_HOME/Contents/basis-link" ) {
- $main::OFFICE_BASE_HOME = "$main::OFFICE_HOME/Contents/basis-link";
- if ( -d "$main::OFFICE_BASE_HOME/ure-link" ) {
- $main::OO_SDK_URE_HOME = "$main::OFFICE_BASE_HOME/ure-link";
- } else {
- $main::OFFICE_HOME = "";
- $main::OFFICE_BASE_HOME = "";
- $main::OO_SDK_URE_HOME = "";
- print " Error: no URE found in office installation, please specify the path to a valid installation.\n";
- }
- } else {
- $main::OFFICE_HOME = "";
- $main::OFFICE_BASE_HOME = "";
- $main::OO_SDK_URE_HOME = "";
- print " Error: no base layer found in office installation, please specify the path to a valid installation.\n";
- }
- }
- } else
+ if ( ! -d "$main::OFFICE_HOME" )
{
- $main::OFFICE_HOME_SUGGESTION = searchoffice();
+ $main::OFFICE_HOME = "";
+ print " Error: An office installation is required, please specify the path to a valid installation.\n";
+ }
- if ( $main::OFFICE_HOME_SUGGESTION eq "" ) {
- # prepare Office path
- $main::OFFICE_HOME_SUGGESTION = searchprog("soffice");
- }
+# $main::OFFICE_BASE_HOME = "$main::OFFICE_HOME/Contents";
+ }
+} else
+{
+ $main::OFFICE_HOME_SUGGESTION = searchoffice();
- if ( ! $main::OFFICE_HOME_SUGGESTION eq "" )
- {
- my $tmpOffice = readlink "$main::OFFICE_HOME_SUGGESTION/soffice";
+ if ( $main::OFFICE_HOME_SUGGESTION eq "" ) {
+ # prepare Office path
+ $main::OFFICE_HOME_SUGGESTION = searchprog("soffice");
+ }
- if ( $tmpOffice eq "" )
- {
- $tmpOffice = "$main::OFFICE_HOME_SUGGESTION/soffice";
- }
+ if ( ! $main::OFFICE_HOME_SUGGESTION eq "" )
+ {
+ my $tmpOffice = readlink "$main::OFFICE_HOME_SUGGESTION/soffice";
- my $offset = rindex($tmpOffice, "/program/soffice");
- if ( $offset != -1 )
- {
- $main::OFFICE_HOME_SUGGESTION = substr($tmpOffice, 0, $offset);
- } else
- {
- $offset = rindex($tmpOffice, "/soffice");
- if ( $offset != -1 )
- {
- $main::OFFICE_HOME_SUGGESTION = substr($tmpOffice, 0, $offset);
- } else
- {
- $main::OFFICE_HOME_SUGGESTION = "";
- }
- }
- }
+ if ( $tmpOffice eq "" )
+ {
+ $tmpOffice = "$main::OFFICE_HOME_SUGGESTION/soffice";
+ }
- while ( (! -d "$main::OFFICE_HOME" ) ||
- ((-d "$main::OFFICE_HOME") && (! -d "$main::OFFICE_HOME/program")) )
+ my $offset = rindex($tmpOffice, "/program/soffice");
+ if ( $offset != -1 )
+ {
+ $main::OFFICE_HOME_SUGGESTION = substr($tmpOffice, 0, $offset);
+ } else
+ {
+ $offset = rindex($tmpOffice, "/soffice");
+ if ( $offset != -1 )
{
- print " Enter the Office installation directory [$main::OFFICE_HOME_SUGGESTION]: ";
- $main::OFFICE_HOME = readStdIn();
- chop($main::OFFICE_HOME);
- if ( $main::OFFICE_HOME eq "" )
- {
- $main::OFFICE_HOME = $main::OFFICE_HOME_SUGGESTION;
- }
+ $main::OFFICE_HOME_SUGGESTION = substr($tmpOffice, 0, $offset);
+ } else
+ {
+ $main::OFFICE_HOME_SUGGESTION = "";
+ }
+ }
+ }
- if ( ! -d "$main::OFFICE_HOME" )
- {
- $main::OFFICE_HOME = "";
- print " Error: An office installation is required, please specify the path to a valid installation.\n";
- } else
- {
- # special work for a network installation, no prgram directory but a link to the soffice binary
- if ( (! -d "$main::OFFICE_HOME/program") && (-e "$main::OFFICE_HOME/soffice") )
- {
- my $soserver = `ls -l $OFFICE_HOME_SUGGESTION/soffice | sed -n 's/.* -> //p'`;
- $soserver= substr($soserver, 0, rindex($soserver, "program") - 1);
+ while ( (! -d "$main::OFFICE_HOME" ) ||
+ ((-d "$main::OFFICE_HOME") && (! -d "$main::OFFICE_HOME/program")) )
+ {
+ print " Enter the Office installation directory [$main::OFFICE_HOME_SUGGESTION]: ";
+ $main::OFFICE_HOME = readStdIn();
+ chop($main::OFFICE_HOME);
+ if ( $main::OFFICE_HOME eq "" )
+ {
+ $main::OFFICE_HOME = $main::OFFICE_HOME_SUGGESTION;
+ }
- if ( ! -d $soserver )
- {
- $main::OFFICE_HOME = "";
- print " Error: An office installation is required, please specify the path to a valid installation.\n";
- } else
- {
- $main::OFFICE_HOME = $soserver;
- }
- }
- }
+ if ( ! -d "$main::OFFICE_HOME" )
+ {
+ $main::OFFICE_HOME = "";
+ print " Error: An office installation is required, please specify the path to a valid installation.\n";
+ } else
+ {
+ # special work for a network installation, no prgram directory but a link to the soffice binary
+ if ( (! -d "$main::OFFICE_HOME/program") && (-e "$main::OFFICE_HOME/soffice") )
+ {
+ my $soserver = `ls -l $OFFICE_HOME_SUGGESTION/soffice | sed -n 's/.* -> //p'`;
+ $soserver= substr($soserver, 0, rindex($soserver, "program") - 1);
+
+ if ( ! -d $soserver )
+ {
+ $main::OFFICE_HOME = "";
+ print " Error: An office installation is required, please specify the path to a valid installation.\n";
+ } else
+ {
+ $main::OFFICE_HOME = $soserver;
+ }
}
}
-}
-else
-{
- # prepare URE path
- $main::OO_SDK_URE_HOME_SUGGESTION = "/opt/openoffice/ure";
- $main::OO_SDK_URE_HOME_SUGGESTION = "" unless
- -e "$main::OO_SDK_URE_HOME_SUGGESTION/bin/uno";
- for (;;)
- {
- print " Enter the URE installation directory",
- " [$main::OO_SDK_URE_HOME_SUGGESTION]: ";
- $main::OO_SDK_URE_HOME = readStdIn();
- chop $main::OO_SDK_URE_HOME;
- $main::OO_SDK_URE_HOME = $main::OO_SDK_URE_HOME_SUGGESTION if
- $main::OO_SDK_URE_HOME eq "" &&
- $main::OO_SDK_URE_HOME_SUGGESTION ne "";
- last if -e "$main::OO_SDK_URE_HOME/bin/uno";
- print " Error: A valid URE installation is required.\n";
}
}
+
# prepare GNU make path
while ( (!$main::correctVersion) &&
((! -d "$main::OO_SDK_MAKE_HOME" ) ||
@@ -573,25 +524,18 @@ while ( (!$main::skipOutputDir) &&
}
# prepare auto deployment
-if ( $main::OFFICE_OR_URE eq "Office" )
+while ( $main::SDK_AUTO_DEPLOYMENT eq "" ||
+ ((! $main::SDK_AUTO_DEPLOYMENT eq "YES") &&
+ (! $main::SDK_AUTO_DEPLOYMENT eq "NO")) )
{
- while ( $main::SDK_AUTO_DEPLOYMENT eq "" ||
- ((! $main::SDK_AUTO_DEPLOYMENT eq "YES") &&
- (! $main::SDK_AUTO_DEPLOYMENT eq "NO")) )
- {
- print " Automatic deployment of UNO components (YES/NO) [$main::SDK_AUTO_DEPLOYMENT_SUGGESTION]: ";
- $main::SDK_AUTO_DEPLOYMENT = uc <STDIN>;
- chop($main::SDK_AUTO_DEPLOYMENT);
- if ( $main::SDK_AUTO_DEPLOYMENT eq "" )
- {
- $main::SDK_AUTO_DEPLOYMENT = "YES";
- }
+ print " Automatic deployment of UNO components (YES/NO) [$main::SDK_AUTO_DEPLOYMENT_SUGGESTION]: ";
+ $main::SDK_AUTO_DEPLOYMENT = uc <STDIN>;
+ chop($main::SDK_AUTO_DEPLOYMENT);
+ if ( $main::SDK_AUTO_DEPLOYMENT eq "" )
+ {
+ $main::SDK_AUTO_DEPLOYMENT = "YES";
}
}
-else
-{
- $main::SDK_AUTO_DEPLOYMENT = "NO";
-}
prepareScriptFile("setsdkenv_unix.sh.in", "setsdkenv_unix.sh");
chmod 0644, "$main::OO_SDK_CONFIG_HOME/$main::hostname/setsdkenv_unix.sh";
@@ -714,19 +658,6 @@ sub searchMacOffice
if (-d "/Applications/OpenOffice.app" ) {
return "/Applications/OpenOffice.app"
}
- if (-d "/Applications/OpenOffice.org.app" ) {
- return "/Applications/OpenOffice.org.app"
- }
- if (-d "/Applications/Oracle Open Office.app" ) {
- return "/Applications/Oracle Open Office.app";
- }
- if (-d "/Applications/StarOffice.app" ) {
- return "/Applications/StarOffice.app";
- }
- if (-d "/Applications/StarSuite.app" ) {
- return "/Applications/StarSuite.app";
- }
-
return "";
}
@@ -744,59 +675,7 @@ sub searchoffice
if (-d $officepath && -e "$officepath/program/soffice") {
return $officepath;
}
- # fallback
- my $tmpversion = $main::OO_MAJORVERSION;
-# if ( $main::OO_MINORVERSION > 0) {
-# $tmpversion = "$tmpversion.$main::OO_MINORVERSION";
-# }
-
- $officepath = "$tmpOffice/oracle_open_office$tmpversion";
- if (-d $officepath && -e "$officepath/program/soffice") {
- return $officepath;
- }
-
- my $tmpversion = $main::OO_MAJORVERSION + 6;
- if ( $main::OO_MINORVERSION > 0) {
- $tmpversion = "$tmpversion.$main::OO_MINORVERSION";
- }
-
- $officepath = "$tmpOffice/staroffice$tmpversion";
- if (-d $officepath && -e "$officepath/program/soffice") {
- return $officepath;
- }
- $officepath = "$tmpOffice/StarOffice$tmpversion";
- if (-d $officepath && -e "$officepath/program/soffice") {
- return $officepath;
- }
- $officepath = "$tmpOffice/starsuite$tmpversion";
- if (-d $officepath && -e "$officepath/program/soffice") {
- return $officepath;
- }
- $officepath = "$tmpOffice/StarSuite$tmpversion";
- if (-d $officepath && -e "$officepath/program/soffice") {
- return $officepath;
- }
- $officepath = "";
-
- # search other potential matching office versions
- my $path = "/opt/";
- my $entry = "";
- my $version = "0";
- for $entry (glob($path.'*')) {
- ## if the file is a directory
- if( -d $entry) {
-
- if ($entry =~ m#(.+(o|O)ffice(\.org){0,1}(\d([\d\.]){0,2}))# ||
- $entry =~ m#(.+(s|S)uite(.*)(\d([\d\.]){0,2}))# )
- {
- if ($4 > $version) {
- $version = $4;
- $officepath = $entry;
- }
- }
- }
- }
- return $officepath;
+ return "";
}
@@ -865,8 +744,7 @@ sub prepareScriptFile()
$_ =~ s#\@OO_SDK_NAME\@#$main::OO_SDK_NAME#go;
$_ =~ s#\@OO_SDK_HOME\@#$main::OO_SDK_HOME#go;
$_ =~ s#\@OFFICE_HOME\@#$main::OFFICE_HOME#go;
- $_ =~ s#\@OFFICE_BASE_HOME\@#$main::OFFICE_BASE_HOME#go;
- $_ =~ s#\@OO_SDK_URE_HOME\@#$main::OO_SDK_URE_HOME#go;
+# $_ =~ s#\@OFFICE_BASE_HOME\@#$main::OFFICE_BASE_HOME#go;
$_ =~ s#\@OO_SDK_MAKE_HOME\@#$main::OO_SDK_MAKE_HOME#go;
$_ =~ s#\@OO_SDK_ZIP_HOME\@#$main::OO_SDK_ZIP_HOME#go;
$_ =~ s#\@OO_SDK_CAT_HOME\@#$main::OO_SDK_CAT_HOME#go;
diff --git a/odk/setsdkenv_unix b/odk/setsdkenv_unix
index 859767c..b42f0be 100644
--- a/odk/setsdkenv_unix
+++ b/odk/setsdkenv_unix
@@ -30,7 +30,7 @@ if [ "$OSTYPE" = "Darwin" ]
then
OO_SDK_NAME=`basename $OO_SDK_HOME`
else
- OO_SDK_NAME=apacheopenoffice${OOVERSION}_sdk
+ OO_SDK_NAME=openoffice${OOVERSION}_sdk
fi
export OO_SDK_HOME
@@ -41,11 +41,7 @@ then
then
rm $HOME/$OO_SDK_NAME/$HOSTNAME/setsdkenv_unix.sh
fi
- if [ -r $HOME/$OO_SDK_NAME/$HOSTNAME/setsdkenv_unix.csh ]
- then
- rm $HOME/$OO_SDK_NAME/$HOSTNAME/setsdkenv_unix.csh
- fi
- shift
+ shift
elif [ "$1" = "-h" ] || [ "$1" = "--help" ] || [ -n "$1" ]
then
echo
diff --git a/odk/setsdkenv_unix.sh.in b/odk/setsdkenv_unix.sh.in
index 018befe..878d134 100644
--- a/odk/setsdkenv_unix.sh.in
+++ b/odk/setsdkenv_unix.sh.in
@@ -35,12 +35,6 @@ OO_SDK_HOME='@OO_SDK_HOME@'
# Office installation directory.
# Example: OFFICE_HOME=/opt/openoffice4
OFFICE_HOME='@OFFICE_HOME@'
-OFFICE_BASE_HOME='@OFFICE_BASE_HOME@'
-
-# URE installation directory.
-# Example: OO_SDK_URE_HOME=/opt/openoffice/ure
-OO_SDK_URE_HOME='@OO_SDK_URE_HOME@'
-export OO_SDK_URE_HOME
# Directory of the make command.
# Example: OO_SDK_MAKE_HOME=/usr/bin
@@ -115,14 +109,6 @@ then
export OFFICE_PROGRAM_PATH
fi
-# Set office program path (only set when using an Office).
-if [ "${OFFICE_BASE_HOME}" ]
-then
- OFFICE_BASE_PROGRAM_PATH=${OFFICE_BASE_HOME}/program
- export OFFICE_BASE_PROGRAM_PATH
-fi
-
-
# Set UNO path, necessary to ensure that the cpp examples using the
# new UNO bootstrap mechanism use the configured office installation (only set
# when using an Office).
@@ -132,16 +118,10 @@ then
export UNO_PATH
fi
-if [ "${OO_SDK_URE_HOME}" ]
-then
- OO_SDK_URE_BIN_DIR=${OO_SDK_URE_HOME}/bin
- OO_SDK_URE_LIB_DIR=${OO_SDK_URE_HOME}/lib
- OO_SDK_URE_JAVA_DIR=${OO_SDK_URE_HOME}/share/java
-else
- OO_SDK_URE_BIN_DIR=${OFFICE_PROGRAM_PATH}
- OO_SDK_URE_LIB_DIR=${OFFICE_BASE_PROGRAM_PATH}
- OO_SDK_URE_JAVA_DIR=${OFFICE_BASE_PROGRAM_PATH}/classes
-fi
+OO_SDK_URE_BIN_DIR=${OFFICE_PROGRAM_PATH}
+OO_SDK_URE_LIB_DIR=${OFFICE_PROGRAM_PATH}
+OO_SDK_URE_JAVA_DIR=${OFFICE_PROGRAM_PATH}/classes
+
export OO_SDK_URE_BIN_DIR
export OO_SDK_URE_LIB_DIR
export OO_SDK_URE_JAVA_DIR
@@ -189,7 +169,7 @@ case ${sdk_platform} in
exampleout=MACOSXexample.out
platform=MacOSX
stldebug=_stldebug
- DYLD_LIBRARY_PATH=${OO_SDK_OUT}/${directoryname}/lib:${OO_SDK_OUT}/${exampleout}/lib:${OO_SDK_URE_LIB_DIR}:.:${DYLD_LIBRARY_PATH}
+ DYLD_LIBRARY_PATH=/usr/lib:${OO_SDK_OUT}/${directoryname}/lib:${OO_SDK_OUT}/${exampleout}/lib:${OO_SDK_URE_LIB_DIR}:.:${DYLD_LIBRARY_PATH}
export DYLD_LIBRARY_PATH
;;
@@ -257,7 +237,7 @@ esac
PATH=${OO_SDK_HOME}/bin:${OO_SDK_OUT}/${exampleout}/bin:${OO_SDK_URE_BIN_DIR}:${OFFICE_PROGRAM_PATH}:.:${PATH}
# Set the classpath
-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:${OFFICE_BASE_PROGRAM_PATH}/classes/unoil.jar:${CLASSPATH}
+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_URE_JAVA_DIR}/unoil.jar:${CLASSPATH}
export CLASSPATH
@@ -339,7 +319,7 @@ then
fi
# prepare links
- if [ "${OO_SDK_URE_HOME}" ]
+ if [ "${OFFICE_HOME}" ]
then
mkdir -p "${OO_SDK_OUT}/${directoryname}/lib"
ln -s "${OO_SDK_URE_LIB_DIR}/libuno_cppu.${soext}.3" \
@@ -370,8 +350,6 @@ echo " * SDK environment is prepared for ${platform}"
echo " *"
echo " * SDK = $OO_SDK_HOME"
echo " * Office = $OFFICE_HOME"
-echo " * Office Base = $OFFICE_BASE_HOME"
-echo " * URE = $OO_SDK_URE_HOME"
echo " * Make = $OO_SDK_MAKE_HOME"
echo " * Zip = $OO_SDK_ZIP_HOME"
echo " * cat = $OO_SDK_CAT_HOME"
diff --git a/odk/setsdkenv_windows.template b/odk/setsdkenv_windows.template
index b28ae0a..eb04beb 100644
--- a/odk/setsdkenv_windows.template
+++ b/odk/setsdkenv_windows.template
@@ -1,199 +1,157 @@
@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 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=apacheopenoffice4.0_sdk
-set OO_SDK_NAME=apacheopenoffice4.0_sdk
+REM Example: set OO_SDK_NAME=openoffice4.0_sdk
+set OO_SDK_NAME=openoffice4.0_sdk
REM Installation directory of the Software Development Kit.
-REM Example: set OO_SDK_HOME=C:\Program Files\OpenOffice\Basic 4.0\sdk
-set OO_SDK_HOME=
+REM Example: set OO_SDK_HOME=C:\Program Files\OpenOffice 4\sdk
+ at set OO_SDK_HOME=
REM Office installation directory.
REM Example: set OFFICE_HOME=C:\Program Files\OpenOffice 4
-set OFFICE_HOME=
-
-REM Example: set OFFICE_HOME=C:\Program Files\OpenOffice\Basis 4.0
-set OFFICE_BASE_HOME=
-
-REM URE installation directory.
-REM Example: set OO_SDK_URE_HOME=C:\Program Files\OpenOffice\URE
-set OO_SDK_URE_HOME=
+ at set OFFICE_HOME=
REM Directory of the make command.
-REM Example: set OO_SDK_MAKE_HOME=D:\NextGenerationMake\make
-set OO_SDK_MAKE_HOME=
+REM Example: set OO_SDK_MAKE_HOME=C:\UnixTools\usr\local\wbin
+ at set OO_SDK_MAKE_HOME=
REM Directory of the zip tool.
-REM Example: set OO_SDK_ZIP_HOME=D:\infozip\bin
-set OO_SDK_ZIP_HOME=
+REM Example: set OO_SDK_ZIP_HOME=C:\UnixTools\usr\local\wbin
+ at set OO_SDK_ZIP_HOME=
REM Directory of the cat tool.
-REM Example: set OO_SDK_CAT_HOME=C:\UnxUtils\usr\local\wbin\
-set OO_SDK_CAT_HOME=
+REM Example: set OO_SDK_CAT_HOME=C:\UnxUtils\usr\local\wbin
+ at set OO_SDK_CAT_HOME=
REM Directory of the sed tool.
-REM Example: set OO_SDK_SED_HOME=C:\UnxUtils\usr\local\wbin\
-set OO_SDK_SED_HOME=
+REM Example: set OO_SDK_SED_HOME=C:\UnxUtils\usr\local\wbin
+ at set OO_SDK_SED_HOME=
REM Directory of the C++ compiler.
REM Example:set OO_SDK_CPP_HOME=C:\Program Files\Microsoft Visual Studio 9.0\VC\bin
-REM Example:set CPP_WINDOWS_SDK=C:\Program Files\\Microsoft SDKs\Windows\v6.0A\
-set OO_SDK_CPP_HOME=
-set CPP_VC8=
-set CPP_WINDOWS_SDK=
+ at set OO_SDK_CPP_HOME=
+ at set CPP_MANIFEST=
+ at set CPP_WINDOWS_SDK=
REM Directory of the C# and VB.NET compilers.
REM Example:set OO_SDK_CLI_HOME=C:\WINXP\Microsoft.NET\Framework\v1.0.3705
-set OO_SDK_CLI_HOME=
+ at set OO_SDK_CLI_HOME=
REM Java SDK installation directory.
REM Example: set OO_SDK_JAVA_HOME=C:\Program Files\Java\jdk1.6.0_05
-set OO_SDK_JAVA_HOME=
+ at set OO_SDK_JAVA_HOME=
REM Special output directory
-REM Example: set OO_SDK_OUT=C:\apacheopenoffice4.0_sdk
-set OO_SDK_OUT=
+REM Example: set OO_SDK_OUT=C:\openoffice4.0_sdk
+ at set OO_SDK_OUT=
REM Automatic deployment
REM Example: set SDK_AUTO_DEPLOYMENT=YES
-set SDK_AUTO_DEPLOYMENT=YES
+ at set SDK_AUTO_DEPLOYMENT=YES
-set STLDEBUG=
+ 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 @set STLDEBUG=_stldebug
REM )
-REM Check installation path for the StarOffice Development Kit.
+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 the office.
-REM if not defined OFFICE_HOME (
-REM if not defined OO_SDK_URE_HOME (
-REM echo Error: either of the variables OFFICE_HOME and
-REM echo OO_SDK_URE_HOME is missing!
-REM goto :error
-REM )
-REM )
-
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.
-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
- )
-
-REM Set office program path.
-if defined OFFICE_BASE_HOME (
- set OFFICE_BASE_PROGRAM_PATH=%OFFICE_BASE_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 if defined OO_SDK_URE_HOME (
-set OO_SDK_URE_BIN_DIR=%OO_SDK_URE_HOME%\bin
-set OO_SDK_URE_LIB_DIR=%OO_SDK_URE_HOME%\bin
-set OO_SDK_URE_JAVA_DIR=%OO_SDK_URE_HOME%\java
-REM ) else (
-set OO_SDK_OFFICE_BIN_DIR=%OFFICE_PROGRAM_PATH%
-set OO_SDK_OFFICE_LIB_DIR=%OFFICE_BASE_PROGRAM_PATH%
-set OO_SDK_OFFICE_JAVA_DIR=%OFFICE_BASE_PROGRAM_PATH%\classes
-REM )
+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
REM Set classpath
-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
-REM if defined OFFICE_HOME (
-REM set CLASSPATH=%CLASSPATH%;%OO_SDK_OFFICE_JAVA_DIR%\unoil.jar
-REM )
+ 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.
-set PATH=%OO_SDK_HOME%\bin;%OO_SDK_URE_BIN_DIR%;%OO_SDK_OFFICE_BIN_DIR%;%OO_SDK_HOME%\WINexample.out\bin;%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%
-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%
- )
+ @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.
-if defined OO_SDK_MAKE_HOME set PATH=%OO_SDK_MAKE_HOME%;%PATH%
+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.
-if defined OO_SDK_ZIP_HOME set PATH=%OO_SDK_ZIP_HOME%;%PATH%
+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.
-if defined OO_SDK_CAT_HOME set PATH=%OO_SDK_CAT_HOME%;%PATH%
+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.
-if defined OO_SDK_SED_HOME set PATH=%OO_SDK_SED_HOME%;%PATH%
+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.
-if defined OO_SDK_CPP_HOME set PATH=%OO_SDK_CPP_HOME%;%PATH%
+REM if defined OO_SDK_CPP_HOME @set PATH+=%OO_SDK_CPP_HOME%
+
+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%
+)
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"
@@ -209,8 +167,6 @@ echo * SDK environment is prepared for Windows
echo *
echo * SDK = %OO_SDK_HOME%
echo * Office = %OFFICE_HOME%
-echo * Office Base = %OFFICE_BASE_HOME%
-echo * URE = %OO_SDK_URE_HOME%
echo * Make = %OO_SDK_MAKE_HOME%
echo * Zip = %OO_SDK_ZIP_HOME%
echo * cat = %OO_SDK_CAT_HOME%
@@ -223,9 +179,10 @@ 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
+
diff --git a/odk/settings/settings.mk b/odk/settings/settings.mk
index 7435d72..8917052 100644
--- a/odk/settings/settings.mk
+++ b/odk/settings/settings.mk
@@ -135,9 +135,9 @@ endif
LINK_JAVA_LIBS=/LIBPATH:"$(OO_SDK_JAVA_HOME)/lib"
-ifneq "$(OO_SDK_URE_HOME)" ""
-URE_MISC=$(OO_SDK_URE_HOME)\misc
-endif
+#ifneq "$(OFFICE_PROGRAM_PATH)" ""
+#URE_MISC=$(OFFICE_PROGRAM_PATH)\misc
+#endif
# use this for release version
#EXE_LINK_FLAGS=/MAP /OPT:NOREF /SUBSYSTEM:CONSOLE /BASE:0x1100000
@@ -154,7 +154,7 @@ endif
ifneq (,$(findstring solaris,$(PLATFORM)))
# Settings for Solaris using Sun Workshop compiler
-PROCTYPE := $(shell $(PRJ)/config.guess | cut -d"-" -f1)$(shell /usr/ccs/bin/elfdump -e "$(OO_SDK_URE_HOME)/lib/libuno_sal.so.3" | /usr/xpg4/bin/grep -q -w ELFCLASS64 && echo 64)
+PROCTYPE := $(shell $(PRJ)/config.guess | cut -d"-" -f1)$(shell /usr/ccs/bin/elfdump -e "$(OFFICE_PROGRAM_PATH)/libuno_sal.so.3" | /usr/xpg4/bin/grep -q -w ELFCLASS64 && echo 64)
ifeq "$(PROCTYPE)" "sparc"
PLATFORM=solsparc
@@ -255,8 +255,8 @@ LIBRARY_LINK_FLAGS+=-m64
EXE_LINK_FLAGS+=-m64
endif
-ifneq "$(OO_SDK_URE_HOME)" ""
-URE_MISC=$(OO_SDK_URE_HOME)/share/misc
+ifneq "$(OFFICE_PROGRAM_PATH)" ""
+URE_MISC=$(OFFICE_PROGRAM_PATH)/share/misc
endif
endif
@@ -402,8 +402,8 @@ EXE_LINK_FLAGS=-Wl,--allow-shlib-undefined -Wl,-export-dynamic -Wl,-z,defs -Wl,-
LINK_LIBS=-L"$(OUT)/lib" -L"$(OO_SDK_HOME)/lib" -L"$(OO_SDK_URE_LIB_DIR)"
LINK_JAVA_LIBS=-L"$(OO_SDK_JAVA_HOME)/jre/lib/$(JAVA_PROC_TYPE)"
-ifneq "$(OO_SDK_URE_HOME)" ""
-URE_MISC=$(OO_SDK_URE_HOME)/share/misc
+ifneq "$(OFFICE_PROGRAM_PATH)" ""
+URE_MISC=$(OFFICE_PROGRAM_PATH)/share/misc
endif
endif
@@ -490,7 +490,7 @@ SALHELPERDYLIB=-Wl,-dylib_file, at ________________________________________________
REGDYLIB=-Wl,-dylib_file, at __________________________________________________URELIB/libreg.dylib.3:'$(OO_SDK_URE_LIB_DIR)/libreg.dylib'
STOREDYLIB=-Wl,-dylib_file, at __________________________________________________URELIB/libstore.dylib.3:'$(OO_SDK_URE_LIB_DIR)/libstore.dylib'
-INSTALL_NAME_URELIBS=install_name_tool -change @__________________________________________________URELIB/libuno_sal.dylib.3 @executable_path/urelibs/libuno_sal.dylib.3 -change @__________________________________________________URELIB/libuno_cppu.dylib.3 @executable_path/urelibs/libuno_cppu.dylib.3 -change @__________________________________________________URELIB/libuno_cppuhelper$(COMID).dylib.3 @executable_path/urelibs/libuno_cppuhelper$(COMID).dylib.3 -change @__________________________________________________URELIB/libuno_salhelper$(COMID).dylib.3 @executable_path/urelibs/libuno_salhelper$(COMID).dylib.3 -change @__________________________________________________URELIB/libreg.dylib.3 @executable_path/urelibs/libreg.dylib.3 -change @__________________________________________________URELIB/libstore.dylib.3 @executable_path/urelibs/libstore.dylib.3
+INSTALL_NAME_URELIBS=install_name_tool -change @__________________________________________________URELIB/libuno_sal.dylib.3 @executable_path/libuno_sal.dylib.3 -change @__________________________________________________URELIB/libuno_cppu.dylib.3 @executable_path/libuno_cppu.dylib.3 -change @__________________________________________________URELIB/libuno_cppuhelper$(COMID).dylib.3 @executable_path/libuno_cppuhelper$(COMID).dylib.3 -change @__________________________________________________URELIB/libuno_salhelper$(COMID).dylib.3 @executable_path/libuno_salhelper$(COMID).dylib.3 -change @__________________________________________________URELIB/libreg.dylib.3 @executable_path/libreg.dylib.3 -change @__________________________________________________URELIB/libstore.dylib.3 @executable_path/libstore.dylib.3
INSTALL_NAME_URELIBS_BIN=install_name_tool -change @__________________________________________________URELIB/libuno_sal.dylib.3 libuno_sal.dylib.3 -change @__________________________________________________URELIB/libuno_cppu.dylib.3 libuno_cppu.dylib.3 -change @__________________________________________________URELIB/libuno_cppuhelper$(COMID).dylib.3 libuno_cppuhelper$(COMID).dylib.3 -change @__________________________________________________URELIB/libuno_salhelper$(COMID).dylib.3 libuno_salhelper$(COMID).dylib.3 -change @__________________________________________________URELIB/libreg.dylib.3 libreg.dylib.3 -change @__________________________________________________URELIB/libstore.dylib.3 libstore.dylib.3
@@ -528,8 +528,8 @@ LINK_LIBS=-L$(OUT)/lib -L$(OO_SDK_OUT)/$(PLATFORM)/lib -L"$(OO_SDK_URE_LIB_DIR)"
LINK_JAVA_LIBS=-framework JavaVM
#LINK_JAVA_LIBS=-L"$(OO_SDK_JAVA_HOME)/Libraries"
-ifneq "$(OO_SDK_URE_HOME)" ""
-URE_MISC=$(OO_SDK_URE_HOME)/share/misc
+ifneq "$(OFFICE_PROGRAM_PATH)" ""
+URE_MISC=$(OFFICE_PROGRAM_PATH)/share/misc
endif
endif
@@ -652,9 +652,9 @@ EXE_LINK_FLAGS=-Wl,--allow-shlib-undefined
LINK_LIBS=-L"$(OUT)/lib" -L"$(OO_SDK_HOME)/lib" -L"$(OO_SDK_URE_LIB_DIR)" $(PTHREAD_LIBS)
LINK_JAVA_LIBS=-L"$(OO_SDK_JAVA_HOME)/jre/lib/$(JAVA_PROC_TYPE)"
-ifneq "$(OO_SDK_URE_HOME)" ""
-URE_MISC=$(OO_SDK_URE_HOME)/share/misc
-endif
+#ifneq "$(OFFICE_PROGRAM_PATH)" ""
+#URE_MISC=$(OFFICE_PROGRAM_PATH)/share/misc
+#endif
endif
diff --git a/odk/settings/std.mk b/odk/settings/std.mk
index 96e7648..ecf70ae 100644
--- a/odk/settings/std.mk
+++ b/odk/settings/std.mk
@@ -40,17 +40,17 @@ OUT_DEPLOY=$(OUT)/deploy
IDL_DIR=$(PRJ)/idl
BIN_DIR=$(PRJ)/bin
CLASSES_DIR=$(PRJ)/classes
-URE_CLASSES_DIR=$(subst \,/,$(OO_SDK_URE_JAVA_DIR))
-OFFICE_CLASSES_DIR=$(subst \,/,$(OFFICE_BASE_PROGRAM_PATH))/classes
+URE_CLASSES_DIR=$(subst \,/,$(OFFICE_PROGRAM_PATH))/classes
+OFFICE_CLASSES_DIR=$(subst \,/,$(OFFICE_PROGRAM_PATH))/classes
COMP_PACKAGE_DIR=$(subst /,$(PS),$(OUT_BIN))
SDKTYPEFLAG=$(OUT_MISC)/oosdk_cpp_types.flag
-URE_TYPES="$(subst \,/,$(URE_MISC)$(PS)types.rdb)"
-URE_SERVICES=$(subst \\,\,$(URE_MISC)$(PS)services.rdb)
+URE_TYPES="$(subst \,/,$(OFFICE_PROGRAM_PATH)$(PS)types.rdb)"
+URE_SERVICES=$(subst \\,\,$(OFFICE_PROGRAM_PATH)$(PS)services.rdb)
-OFFICE_TYPES="$(subst \,/,$(OFFICE_BASE_PROGRAM_PATH)$(PS)offapi.rdb)"
-OFFICE_SERVICES=$(subst \\,\,$(OFFICE_BASE_PROGRAM_PATH)$(PS)services.rdb)
+OFFICE_TYPES="$(subst \,/,$(OFFICE_PROGRAM_PATH)$(PS)types.rdb)"
+OFFICE_SERVICES=$(subst \\,\,$(OFFICE_PROGRAM_PATH)$(PS)services.rdb)
OFFICE_TYPE_LIBRARY="$(OFFICE_TYPES)"
@@ -64,6 +64,12 @@ endif
endif
endif
+ifeq "$(PLATFORM)" "macosx"
+OFFICE_LAUNCHER=DYLD_LIBRARY_PATH="" && "$(OFFICE_PROGRAM_PATH)$(PS)soffice"
+else
+OFFICE_LAUNCHER="$(OFFICE_PROGRAM_PATH)$(PS)soffice"
+endif
+
DEPLOYTOOL="$(OFFICE_PROGRAM_PATH)$(PS)unopkg" add -f
SDK_JAVA="$(OO_SDK_JAVA_HOME)/$(JAVABIN)/java" $(JAVA_OPTIONS)
SDK_JAVAC="$(OO_SDK_JAVA_HOME)/$(JAVABIN)/javac"
@@ -74,8 +80,8 @@ SDK_SED="$(OO_SDK_SED_HOME)/sed"
IDLC="$(OO_SDK_HOME)/bin/idlc"
CPPUMAKER="$(OO_SDK_HOME)/bin/cppumaker"
JAVAMAKER="$(OO_SDK_HOME)/bin/javamaker"
-REGMERGE="$(OO_SDK_URE_HOME)/bin/regmerge"
-REGCOMP="$(OO_SDK_URE_HOME)/bin/regcomp"
+REGMERGE="$(OFFICE_PROGRAM_PATH)/regmerge"
+REGCOMP="$(OFFICE_PROGRAM_PATH)/regcomp"
SDK_JAVA_UNO_BOOTSTRAP_FILES=\
-C $(CLASSES_DIR) $(SQM)com/sun/star/lib/loader/Loader.class$(SQM) \
diff --git a/odk/settings/stdtarget.mk b/odk/settings/stdtarget.mk
index 2963464..8f50e2e 100644
--- a/odk/settings/stdtarget.mk
+++ b/odk/settings/stdtarget.mk
@@ -32,5 +32,5 @@ install: $(REGISTERFLAG)
$(SDKTYPEFLAG): #$(URE_TYPES) $(OFFICE_TYPES)
-$(MKDIR) $(subst /,$(PS),$(@D))
-$(DEL) $(subst \\,\,$(subst /,$(PS),$(SDKTYPEFLAG)))
- $(CPPUMAKER) -Gc -BUCR -O$(OUT_INC) $(URE_TYPES) $(OFFICE_TYPES)
+ $(CPPUMAKER) -Gc -BUCR -O$(OUT_INC) $(OFFICE_TYPES)
echo flagged > $@
More information about the Libreoffice-commits
mailing list