CWS-TOOLING: integrate CWS sdk311_DEV300

2009-06-09 10:22:56 +0200 jsc  r272754 : #i101883# adapt number
2009-06-03 13:25:57 +0200 jsc  r272559 : #i101883# ensure correct archive name for sdk, adapt resolve_variables_in_downloadname to exchange packageversion
2009-06-03 13:20:14 +0200 jsc  r272558 : #i101883# ensure correct archive or package name
2009-06-02 14:56:40 +0200 jsc  r272506 : #i101883# ensure correct archive or package name
2009-05-27 11:26:35 +0200 jsc  r272337 : CWS-TOOLING: rebase CWS sdk311 to branches/OOO310@272261 (milestone: OOO310:m12)
2009-05-26 15:15:13 +0200 jsc  r272305 : #i101883# ifdef links to URE libs for MacOSX and adapt compiler settings

5 files changed, 67 insertions, 54 deletions

diff --git a/odk/docs/images/sdk_head-1.gif b/odk/docs/images/sdk_head-1.gif
index 13c17cf9787d..96409e25cf02 100644
--- a/odk/docs/images/sdk_head-1.gif
+++ b/odk/docs/images/sdk_head-1.gif
diff --git a/odk/setsdkenv_unix.csh.in b/odk/setsdkenv_unix.csh.in
index 0ab7486feba1..64b59ae16886 100644
--- a/odk/setsdkenv_unix.csh.in
+++ b/odk/setsdkenv_unix.csh.in
@@ -237,34 +237,40 @@ else
 endif
 
 
-# For URE, prepare symbolic links for libraries:
-rm -f "${OO_SDK_OUT}/${directoryname}/lib/libuno_cppu.so" \
-    "${OO_SDK_OUT}/${directoryname}/lib/libuno_cppuhelper${comid}.${soext}" \
-    "${OO_SDK_OUT}/${directoryname}/lib/libuno_sal.${soext}" \
-    "${OO_SDK_OUT}/${directoryname}/lib/libuno_salhelper${comid}.${soext}"
-
-if ( -e "${OO_SDK_OUT}/${directoryname}/lib/libstlport_${pltfrm}${STLDEBUG}.${soext}" ) then
-    rm -rf "${OO_SDK_OUT}/${directoryname}/lib/libstlport_${pltfrm}${STLDEBUG}.${soext}"
-endif
-
-if ( "${OO_SDK_URE_HOME}" != "" ) then
-    mkdir -p "${OO_SDK_OUT}/${directoryname}/lib"
-    ln -s "${OO_SDK_URE_LIB_DIR}/libuno_cppu.${soext}.3" \
-        "${OO_SDK_OUT}/${directoryname}/lib/libuno_cppu.${soext}"
-    ln -s "${OO_SDK_URE_LIB_DIR}/libuno_cppuhelper${comid}.${soext}.3" \
-        "${OO_SDK_OUT}/${directoryname}/lib/libuno_cppuhelper${comid}.${soext}"
-    ln -s "${OO_SDK_URE_LIB_DIR}/libuno_sal.${soext}.3" \
-        "${OO_SDK_OUT}/${directoryname}/lib/libuno_sal.${soext}"
-    ln -s "${OO_SDK_URE_LIB_DIR}/libuno_salhelper${comid}.${soext}.3" \
-        "${OO_SDK_OUT}/${directoryname}/lib/libuno_salhelper${comid}.${soext}"
-
-    if ( -r "${OO_SDK_URE_LIB_DIR}/libstlport_${pltfrm}${STLDEBUG}.${soext}" ) then
-	ln -s "${OO_SDK_URE_LIB_DIR}/libstlport_${pltfrm}${STLDEBUG}.${soext}" \
-	    "${OO_SDK_OUT}/${directoryname}/lib/libstlport_${pltfrm}${STLDEBUG}.${soext}"
+if [ "${platform}" == "MacOSX" ] then
+#    For URE, prepare symbolic links for libraries:
+#    Only necessary on MacOSX, on other Unix systems the links are already prepared
+#    in the SDK installation.
+
+#    cleanup potential old links first
+    rm -f "${OO_SDK_OUT}/${directoryname}/lib/libuno_cppu.so" \
+	"${OO_SDK_OUT}/${directoryname}/lib/libuno_cppuhelper${comid}.${soext}" \
+	"${OO_SDK_OUT}/${directoryname}/lib/libuno_sal.${soext}" \
+	"${OO_SDK_OUT}/${directoryname}/lib/libuno_salhelper${comid}.${soext}"
+
+    if ( -e "${OO_SDK_OUT}/${directoryname}/lib/libstlport_${pltfrm}${STLDEBUG}.${soext}" ) then
+	rm -rf "${OO_SDK_OUT}/${directoryname}/lib/libstlport_${pltfrm}${STLDEBUG}.${soext}"
     endif
 
+    if ( "${OO_SDK_URE_HOME}" != "" ) then
+	mkdir -p "${OO_SDK_OUT}/${directoryname}/lib"
+	ln -s "${OO_SDK_URE_LIB_DIR}/libuno_cppu.${soext}.3" \
+	    "${OO_SDK_OUT}/${directoryname}/lib/libuno_cppu.${soext}"
+	ln -s "${OO_SDK_URE_LIB_DIR}/libuno_cppuhelper${comid}.${soext}.3" \
+	    "${OO_SDK_OUT}/${directoryname}/lib/libuno_cppuhelper${comid}.${soext}"
+	ln -s "${OO_SDK_URE_LIB_DIR}/libuno_sal.${soext}.3" \
+	    "${OO_SDK_OUT}/${directoryname}/lib/libuno_sal.${soext}"
+	ln -s "${OO_SDK_URE_LIB_DIR}/libuno_salhelper${comid}.${soext}.3" \
+	    "${OO_SDK_OUT}/${directoryname}/lib/libuno_salhelper${comid}.${soext}"
+
+	if ( -r "${OO_SDK_URE_LIB_DIR}/libstlport_${pltfrm}${STLDEBUG}.${soext}" ) then
+	    ln -s "${OO_SDK_URE_LIB_DIR}/libstlport_${pltfrm}${STLDEBUG}.${soext}" \
+		"${OO_SDK_OUT}/${directoryname}/lib/libstlport_${pltfrm}${STLDEBUG}.${soext}"
+	endif
+    endif
 endif
 
+ 
 echo 
 echo " ************************************************************************"
 echo " *"                                                  
diff --git a/odk/setsdkenv_unix.sh.in b/odk/setsdkenv_unix.sh.in
index 44fb741eca1b..bb3c16222628 100644
--- a/odk/setsdkenv_unix.sh.in
+++ b/odk/setsdkenv_unix.sh.in
@@ -122,7 +122,7 @@ OO_SDK_OUT=$OO_SDK_HOME
 # Prepare appropriate output directory.
 if [ -n "${OO_SDK_OUTPUT_DIR}" ]
 then
-    OO_SDK_OUT=${OO_SDK_OUTPUT_DIR}/$OO_SDK_NAME
+    OO_SDK_OUT=${OO_SDK_OUTPUT_DIR}/${OO_SDK_NAME}
     export OO_SDK_OUT
 fi
 
@@ -278,37 +278,44 @@ then
     export STLDEBUG
 fi
 
-# For URE, prepare symbolic links for libraries:
-rm -f "${OO_SDK_OUT}/${directoryname}/lib/libuno_cppu.${soext}" \
-    "${OO_SDK_OUT}/${directoryname}/lib/libuno_cppuhelper${comid}.${soext}" \
-    "${OO_SDK_OUT}/${directoryname}/lib/libuno_sal.${soext}" \
-    "${OO_SDK_OUT}/${directoryname}/lib/libuno_salhelper${comid}.${soext}"
-
-if [ -L "${OO_SDK_OUT}/${directoryname}/lib/libstlport_${pltfrm}${STLDEBUG}.${soext}" ]
+if [ "${platform}" = "MacOSX" ]
 then
-    rm -rf "${OO_SDK_OUT}/${directoryname}/lib/libstlport_${pltfrm}${STLDEBUG}.${soext}"
-fi
+#    For URE, prepare symbolic links for libraries:
+#    Only necessary on MacOSX, on other Unix systems the links are already prepared
+#    in the SDK installation.
 
+#    cleanup potential old links first
+    rm -f "${OO_SDK_OUT}/${directoryname}/lib/libuno_cppu.${soext}" \
+	"${OO_SDK_OUT}/${directoryname}/lib/libuno_cppuhelper${comid}.${soext}" \
+	"${OO_SDK_OUT}/${directoryname}/lib/libuno_sal.${soext}" \
+	"${OO_SDK_OUT}/${directoryname}/lib/libuno_salhelper${comid}.${soext}"
 
-if [ "${OO_SDK_URE_HOME}" ]
-then
-    mkdir -p "${OO_SDK_OUT}/${directoryname}/lib"
-    ln -s "${OO_SDK_URE_LIB_DIR}/libuno_cppu.${soext}.3" \
-        "${OO_SDK_OUT}/${directoryname}/lib/libuno_cppu.${soext}"
-    ln -s "${OO_SDK_URE_LIB_DIR}/libuno_cppuhelper${comid}.${soext}.3" \
-        "${OO_SDK_OUT}/${directoryname}/lib/libuno_cppuhelper${comid}.${soext}"
-    ln -s "${OO_SDK_URE_LIB_DIR}/libuno_sal.${soext}.3" \
-        "${OO_SDK_OUT}/${directoryname}/lib/libuno_sal.${soext}"
-    ln -s "${OO_SDK_URE_LIB_DIR}/libuno_salhelper${comid}.${soext}.3" \
-        "${OO_SDK_OUT}/${directoryname}/lib/libuno_salhelper${comid}.${soext}"
-
-    if [ -r "${OO_SDK_URE_LIB_DIR}/libstlport_${pltfrm}${STLDEBUG}.${soext}" ]
+    if [ -L "${OO_SDK_OUT}/${directoryname}/lib/libstlport_${pltfrm}${STLDEBUG}.${soext}" ]
     then
-	ln -s "${OO_SDK_URE_LIB_DIR}/libstlport_${pltfrm}${STLDEBUG}.${soext}" \
-	    "${OO_SDK_OUT}/${directoryname}/lib/libstlport_${pltfrm}${STLDEBUG}.${soext}"
+	rm -rf "${OO_SDK_OUT}/${directoryname}/lib/libstlport_${pltfrm}${STLDEBUG}.${soext}"
     fi
 
-fi
+#    prepare links 
+    if [ "${OO_SDK_URE_HOME}" ]
+    then
+	mkdir -p "${OO_SDK_OUT}/${directoryname}/lib"
+	ln -s "${OO_SDK_URE_LIB_DIR}/libuno_cppu.${soext}.3" \
+	    "${OO_SDK_OUT}/${directoryname}/lib/libuno_cppu.${soext}"
+	ln -s "${OO_SDK_URE_LIB_DIR}/libuno_cppuhelper${comid}.${soext}.3" \
+	    "${OO_SDK_OUT}/${directoryname}/lib/libuno_cppuhelper${comid}.${soext}"
+	ln -s "${OO_SDK_URE_LIB_DIR}/libuno_sal.${soext}.3" \
+	    "${OO_SDK_OUT}/${directoryname}/lib/libuno_sal.${soext}"
+	ln -s "${OO_SDK_URE_LIB_DIR}/libuno_salhelper${comid}.${soext}.3" \
+	    "${OO_SDK_OUT}/${directoryname}/lib/libuno_salhelper${comid}.${soext}"
+
+	if [ -r "${OO_SDK_URE_LIB_DIR}/libstlport_${pltfrm}${STLDEBUG}.${soext}" ]
+	then
+	    ln -s "${OO_SDK_URE_LIB_DIR}/libstlport_${pltfrm}${STLDEBUG}.${soext}" \
+		"${OO_SDK_OUT}/${directoryname}/lib/libstlport_${pltfrm}${STLDEBUG}.${soext}"
+	fi
+    fi
+fi 
+
 
 # Prepare shell with all necessary environment variables.
 echo 
diff --git a/odk/settings/settings.mk b/odk/settings/settings.mk
index 350a78c152d2..7f6d408592f4 100644
--- a/odk/settings/settings.mk
+++ b/odk/settings/settings.mk
@@ -216,7 +216,7 @@ endif
 COMP_LINK_FLAGS=$(LIBRARY_LINK_FLAGS) -M $(PRJ)/settings/component.uno.map
 
 EXE_LINK_FLAGS=-w -mt -z combreloc -PIC -temp=/tmp -norunpath -Bdirect -z defs
-LINK_LIBS=-L$(OUT)/lib -L$(OO_SDK_OUT)/$(PLATFORM)/lib -L"$(OO_SDK_URE_LIB_DIR)"
+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)"
 
 ifeq "$(PROCTYPE)" "sparc64"
@@ -362,7 +362,7 @@ COMP_LINK_FLAGS=$(LIBRARY_LINK_FLAGS) -Wl,--version-script,$(PRJ)/settings/compo
 
 #EXE_LINK_FLAGS=-Wl,--allow-shlib-undefined -Wl,-export-dynamic -Wl,-z,defs -Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive
 EXE_LINK_FLAGS=-Wl,--allow-shlib-undefined -Wl,-export-dynamic -Wl,-z,defs -Wl,--no-whole-archive
-LINK_LIBS=-L$(OUT)/lib -L$(OO_SDK_OUT)/$(PLATFORM)/lib -L"$(OO_SDK_URE_LIB_DIR)"
+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)" ""
@@ -570,7 +570,7 @@ COMP_LINK_FLAGS=$(LIBRARY_LINK_FLAGS) -Wl,--version-script,$(PRJ)/settings/compo
 
 EXE_LINK_FLAGS=-Wl,--allow-shlib-undefined 
 #EXE_LINK_FLAGS+=-Wl,-export-dynamic -Wl,-z,defs
-LINK_LIBS=-L$(OUT)/lib -L$(OO_SDK_OUT)/$(PLATFORM)/lib -L"$(OO_SDK_URE_LIB_DIR)" $(PTHREAD_LIBS)
+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)" ""
diff --git a/odk/util/makefile.pmk b/odk/util/makefile.pmk
index c179f10b24da..5f4ff8f12f24 100644
--- a/odk/util/makefile.pmk
+++ b/odk/util/makefile.pmk
@@ -30,7 +30,7 @@
 #*************************************************************************
 
 # used for sdk common files
-PRODUCT_RELEASE=3.1
+PRODUCT_RELEASE=3.1.1
 OFFICENAME=OpenOffice.org
 SDKDIRNAME=openoffice.org$(PRODUCT_RELEASE)_sdk
 OFFICEPRODUCTNAME=$(OFFICENAME) $(PRODUCT_RELEASE)