CWS-TOOLING: integrate CWS ause129

5 files changed, 22 insertions, 20 deletions

diff --git a/solenv/config/sdev300.ini b/solenv/config/sdev300.ini
index 85a490af161b..ce459e176b77 100644
--- a/solenv/config/sdev300.ini
+++ b/solenv/config/sdev300.ini
@@ -662,7 +662,7 @@ unxlngi6
             JDK14PATH %SOLAR_JDK14PATH%
             JDK15PATH %SOLAR_JDK15PATH%
             KDE_ROOT /so/env/kde/linux/kde-3.2.2
-            LIBMYSQL_PATH %SOLAR_ENV_ROOT%/mysql-connector-c-6.0.2/unxlngi6
+            LIBMYSQL_PATH %SOLARROOT%/mysql-connector-c-6.0.2/unxlngi6
             NO_BSYMBOLIC True
             OJDK16PATH %SOLAR_OJDK16PATH%
             OS LINUX
@@ -943,7 +943,7 @@ unxlngx6
             JDK14PATH %SOLAR_JDK14PATH%
             JDK15PATH %SOLAR_JDK15PATH%
             KDE_ROOT /so/env/kde/linux-x64/kde-3.5.10
-            LIBMYSQL_PATH %SOLAR_ENV_ROOT%/mysql-connector-c-6.0.2/unxlngx6
+            LIBMYSQL_PATH %SOLARROOT%/mysql-connector-c-6.0.2/unxlngx6
             NO_BSYMBOLIC True
             OJDK16PATH %SOLAR_OJDK16PATH%
             OS LINUX
@@ -1238,7 +1238,7 @@ unxmacxi
             JDK13PATH %SOLAR_JDK13PATH%
             JDK14PATH %SOLAR_JDK15PATH%
             JDK15PATH %SOLAR_JDK15PATH%
-            LIBMYSQL_PATH %SOLAR_ENV_ROOT%/mysql-connector-c-6.0.2/unxmacxi
+            LIBMYSQL_PATH %SOLARROOT%/mysql-connector-c-6.0.2/unxmacxi
             NO_BSYMBOLIC True
             OS MACOSX
             OUTPATH unxmacxi
@@ -1489,7 +1489,7 @@ unxsoli4
             JDK13PATH %SOLAR_JDK13PATH%
             JDK14PATH %SOLAR_JDK14PATH%
             JDK15PATH %SOLAR_JDK15PATH%
-            LIBMYSQL_PATH %SOLAR_ENV_ROOT%/mysql-connector-c-6.0.2/unxsoli4
+            LIBMYSQL_PATH %SOLARROOT%/mysql-connector-c-6.0.2/unxsoli4
             OJDK16PATH %SOLAR_OJDK16PATH%
             OS SOLARIS
             OUTPATH unxsoli4
@@ -1751,7 +1751,7 @@ unxsols4
             JDK13PATH %SOLAR_JDK13PATH%
             JDK14PATH %SOLAR_JDK14PATH%
             JDK15PATH %SOLAR_JDK15PATH%
-            LIBMYSQL_PATH %SOLAR_ENV_ROOT%/mysql-connector-c-6.0.2/unxsols4
+            LIBMYSQL_PATH %SOLARROOT%/mysql-connector-c-6.0.2/unxsols4
             LM_LICENSE_FILE %SOLAR_LICENSE_FILE%
             OJDK16PATH %SOLAR_OJDK16PATH%
             OS SOLARIS
@@ -2815,7 +2815,7 @@ wntmsci12
             GUIBASE WIN
             GVER NT351
             INPATH wntmsci12%PROEXT%
-            LIBMYSQL_PATH %SOLAR_ENV_ROOT%$/mysql-connector-c-6.0.2$/wntmsci12
+            LIBMYSQL_PATH %SOLARROOT%$/mysql-connector-c-6.0.2$/wntmsci12
             MOZILLABUILD %SOLARROOT%/mozilla-build-1.3
             OS WNT
             OUTPATH wntmsci12
diff --git a/solenv/gbuild/AllLangResTarget.mk b/solenv/gbuild/AllLangResTarget.mk
index 2d7495026400..b937ac7a35b5 100644
--- a/solenv/gbuild/AllLangResTarget.mk
+++ b/solenv/gbuild/AllLangResTarget.mk
@@ -211,21 +211,22 @@ $(call gb_ResTarget_get_target,%) : $(gb_Helper_MISCDUMMY) | $(gb_ResTarget_RSCT
     $(call gb_Output_announce,$*,$(true),RES,2)
     $(call gb_Helper_abbreviate_dirs_native,\
         mkdir -p $(dir $@) $(OUTDIR)/bin \
-            $(dir $(call gb_ResTarget_get_imagelist_target,$(1))) && \
+            $(dir $(call gb_ResTarget_get_imagelist_target,$*)) && \
         RESPONSEFILE=`$(gb_MKTEMP) $(gb_Helper_MISC)` && \
         echo "-r -p \
             -lg$(LANGUAGE) \
             -fs=$@ \
-            -lip=$(gb_ResTarget_DEFIMAGESLOCATION)$(RESLOCATION)/imglst/$(LANGUAGE) \
-            -lip=$(gb_ResTarget_DEFIMAGESLOCATION)$(RESLOCATION)/imglst \
-            -lip=$(gb_ResTarget_DEFIMAGESLOCATION)$(RESLOCATION)/res/$(LANGUAGE) \
-            -lip=$(gb_ResTarget_DEFIMAGESLOCATION)$(RESLOCATION)/res \
-            -lip=$(gb_ResTarget_DEFIMAGESLOCATION)$(RESLOCATION) \
+            -lip=$(realpath $(gb_ResTarget_DEFIMAGESLOCATION)$(RESLOCATION)/$(LIBRARY)) \
+            -lip=$(realpath $(gb_ResTarget_DEFIMAGESLOCATION)$(RESLOCATION)/imglst/$(LANGUAGE)) \
+            -lip=$(realpath $(gb_ResTarget_DEFIMAGESLOCATION)$(RESLOCATION)/imglst) \
+            -lip=$(realpath $(gb_ResTarget_DEFIMAGESLOCATION)$(RESLOCATION)/res/$(LANGUAGE)) \
+            -lip=$(realpath $(gb_ResTarget_DEFIMAGESLOCATION)$(RESLOCATION)/res) \
+            -lip=$(realpath $(gb_ResTarget_DEFIMAGESLOCATION)$(RESLOCATION)) \
             -lip=$(gb_ResTarget_DEFIMAGESLOCATION)res/$(LANGUAGE) \
             -lip=$(gb_ResTarget_DEFIMAGESLOCATION)res \
-            -subMODULE=$(gb_ResTarget_DEFIMAGESLOCATION) \
+            -subMODULE=$(dir $(realpath $(gb_ResTarget_DEFIMAGESLOCATION)$(RESLOCATION))) \
             -subGLOBALRES=$(gb_ResTarget_DEFIMAGESLOCATION)res \
-            -oil=$(dir $(call gb_ResTarget_get_imagelist_target,$(1))) \
+            -oil=$(dir $(call gb_ResTarget_get_imagelist_target,$*)) \
             $(filter-out $(gb_Helper_MISCDUMMY),$^)" > $${RESPONSEFILE} && \
         $(gb_ResTarget_RSCCOMMAND) @$${RESPONSEFILE} && \
         rm -f $${RESPONSEFILE})
diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index 03ff66523835..933fc48c09d4 100644
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -55,9 +55,11 @@ gb_LinkTarget_get_external_headers_target = $(WORKDIR)/ExternalHeaders/$(1)
 gb_LinkTarget_get_headers_target = $(WORKDIR)/Headers/$(1)
 gb_LinkTarget_get_target = $(WORKDIR)/LinkTarget/$(1)
 gb_Module_get_target = $(WORKDIR)/Module/$(1)
+gb_NoexPrecompiledHeader_get_dep_target = $(WORKDIR)/Dep/NoexPrecompiledHeader/$(gb_NoexPrecompiledHeader_DEBUGDIR)/$(1).hxx.pch.d
 gb_NoexPrecompiledHeader_get_target = $(WORKDIR)/NoexPrecompiledHeader/$(gb_NoexPrecompiledHeader_DEBUGDIR)/$(1).hxx.pch
 gb_ObjCxxObject_get_target = $(WORKDIR)/ObjCxxObject/$(1).o
 gb_Package_get_target = $(WORKDIR)/Package/$(1)
+gb_PrecompiledHeader_get_dep_target = $(WORKDIR)/Dep/PrecompiledHeader/$(gb_PrecompiledHeader_DEBUGDIR)/$(1).hxx.pch.d
 gb_PrecompiledHeader_get_target = $(WORKDIR)/PrecompiledHeader/$(gb_PrecompiledHeader_DEBUGDIR)/$(1).hxx.pch
 gb_ResTarget_get_imagelist_target = $(WORKDIR)/ResTarget/$(1).ilst
 gb_ResTarget_get_target = $(WORKDIR)/ResTarget/$(1).res
@@ -109,8 +111,6 @@ $(eval $(call gb_Helper_make_dep_targets,\
     LinkTarget \
     SrsPartTarget \
     SrsTarget \
-    PrecompiledHeader \
-    NoexPrecompiledHeader \
 ))
 
 
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index 230371907324..742d2aef82fc 100755
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -63,7 +63,7 @@ else # ifeq ($(CPUNAME),POWERPC)
 gb_CPUDEFS := -DPOWERPC -DPPC
 endif
 
-ifeq ($(SYSBASE), "")
+ifeq ($(strip $(SYSBASE)),)
 gb_SDKDIR := /Developer/SDKs/MacOSX10.4u.sdk
 else
 gb_SDKDIR := $(SYSBASE)/MacOSX10.4u.sdk
@@ -274,7 +274,7 @@ gb_Library__FRAMEWORKS += \
 
 gb_Library_PLAINLIBS_NONE += \
     Cocoa \
-     objc \
+    objc \
     jpeg \
     m \
     pthread \
diff --git a/solenv/inc/unxmacx.mk b/solenv/inc/unxmacx.mk
index 77a348138e30..ce049a672d23 100644
--- a/solenv/inc/unxmacx.mk
+++ b/solenv/inc/unxmacx.mk
@@ -48,8 +48,9 @@ CDEFS+=-DX_LOCALE
 # unless you want to do runtime checks for 10.5 api, you also want to use the 10.4 sdk
 # (safer/easier than dealing with the MAC_OS_X_VERSION_MAX_ALLOWED macro)
 # http://developer.apple.com/technotes/tn2002/tn2064.html
-MACOSX_DEPLOYMENT_TARGET=10.4
-.EXPORT: MACOSX_DEPLOYMENT_TARGET
+# done in setsolar/configure now. left here for documentation
+#MACOSX_DEPLOYMENT_TARGET=10.4
+#.EXPORT: MACOSX_DEPLOYMENT_TARGET
 CDEFS+=-DQUARTZ 
 EXTRA_CDEFS*=-isysroot /Developer/SDKs/MacOSX10.4u.sdk
 .ENDIF