Commits

Vladimir Glazunov  committed 85b7153 Merge

CWS-TOOLING: integrate CWS ause129

  • Participants
  • Parent commits d4a8821, a232a58

Comments (0)

Files changed (57)

File default_images/toolkit/source/awt/spinner03-32-hc_01.png

Removed
Old image

File default_images/toolkit/source/awt/spinner03-32-hc_02.png

Removed
Old image

File default_images/toolkit/source/awt/spinner03-32-hc_03.png

Removed
Old image

File default_images/toolkit/source/awt/spinner03-32-hc_04.png

Removed
Old image

File default_images/toolkit/source/awt/spinner03-32-hc_05.png

Removed
Old image

File default_images/toolkit/source/awt/spinner03-32-hc_06.png

Removed
Old image

File default_images/toolkit/source/awt/spinner03-32-hc_07.png

Removed
Old image

File default_images/toolkit/source/awt/spinner03-32-hc_08.png

Removed
Old image

File default_images/toolkit/source/awt/spinner03-32-hc_09.png

Removed
Old image

File default_images/toolkit/source/awt/spinner03-32-hc_10.png

Removed
Old image

File default_images/toolkit/source/awt/spinner03-32-hc_11.png

Removed
Old image

File default_images/toolkit/source/awt/spinner03-32-hc_12.png

Removed
Old image

File default_images/toolkit/source/awt/spinner03-grey_01.png

Removed
Old image

File default_images/toolkit/source/awt/spinner03-grey_02.png

Removed
Old image

File default_images/toolkit/source/awt/spinner03-grey_03.png

Removed
Old image

File default_images/toolkit/source/awt/spinner03-grey_04.png

Removed
Old image

File default_images/toolkit/source/awt/spinner03-grey_05.png

Removed
Old image

File default_images/toolkit/source/awt/spinner03-grey_06.png

Removed
Old image

File default_images/toolkit/source/awt/spinner03-grey_07.png

Removed
Old image

File default_images/toolkit/source/awt/spinner03-grey_08.png

Removed
Old image

File default_images/toolkit/source/awt/spinner03-grey_09.png

Removed
Old image

File default_images/toolkit/source/awt/spinner03-grey_10.png

Removed
Old image

File default_images/toolkit/source/awt/spinner03-grey_11.png

Removed
Old image

File default_images/toolkit/source/awt/spinner03-grey_12.png

Removed
Old image

File default_images/toolkit/tk/spinner03-32-hc_01.png

Added
New image

File default_images/toolkit/tk/spinner03-32-hc_02.png

Added
New image

File default_images/toolkit/tk/spinner03-32-hc_03.png

Added
New image

File default_images/toolkit/tk/spinner03-32-hc_04.png

Added
New image

File default_images/toolkit/tk/spinner03-32-hc_05.png

Added
New image

File default_images/toolkit/tk/spinner03-32-hc_06.png

Added
New image

File default_images/toolkit/tk/spinner03-32-hc_07.png

Added
New image

File default_images/toolkit/tk/spinner03-32-hc_08.png

Added
New image

File default_images/toolkit/tk/spinner03-32-hc_09.png

Added
New image

File default_images/toolkit/tk/spinner03-32-hc_10.png

Added
New image

File default_images/toolkit/tk/spinner03-32-hc_11.png

Added
New image

File default_images/toolkit/tk/spinner03-32-hc_12.png

Added
New image

File default_images/toolkit/tk/spinner03-grey_01.png

Added
New image

File default_images/toolkit/tk/spinner03-grey_02.png

Added
New image

File default_images/toolkit/tk/spinner03-grey_03.png

Added
New image

File default_images/toolkit/tk/spinner03-grey_04.png

Added
New image

File default_images/toolkit/tk/spinner03-grey_05.png

Added
New image

File default_images/toolkit/tk/spinner03-grey_06.png

Added
New image

File default_images/toolkit/tk/spinner03-grey_07.png

Added
New image

File default_images/toolkit/tk/spinner03-grey_08.png

Added
New image

File default_images/toolkit/tk/spinner03-grey_09.png

Added
New image

File default_images/toolkit/tk/spinner03-grey_10.png

Added
New image

File default_images/toolkit/tk/spinner03-grey_11.png

Added
New image

File default_images/toolkit/tk/spinner03-grey_12.png

Added
New image

File postprocess/packregistry/makefile.mk

     cd $(MISC)/$(@:b).unzip && unzip $(SOLARPCKDIR)/$(@:b).zip
     - $(RM) $(MISC)/$(@:b).list
     echo '<list>' $(foreach,i,$(shell cd $(MISC) && \
-        find $(@:b).unzip -name \*.xcu -size +0c -print) \
+        find $(@:b).unzip -name [^.]\*.xcu -size +0c -print) \
         '<filename>$i</filename>') '</list>' > $(MISC)/$(@:b).list
     $(XSLTPROC) --nonet --stringparam prefix $(PWD)/$(MISC)/ -o $@ \
         $(SOLARENV)/bin/packregistry.xslt $(MISC)/$(@:b).list
         unzip $(SOLARPCKDIR)/fcfg_drivers_$*.zip
     - $(RM) $(MISC)/$(@:b).list
     echo '<list>' $(foreach,i,$(shell cd $(MISC) && \
-        find $(@:b).unzip fcfg_drivers_$*.unzip -name \*.xcu -print) \
+        find $(@:b).unzip fcfg_drivers_$*.unzip -name [^.]\*.xcu -print) \
         '<filename>$i</filename>') '</list>' > $(MISC)/$(@:b).list
     $(XSLTPROC) --nonet --stringparam prefix $(PWD)/$(MISC)/ -o $@ \
         $(SOLARENV)/bin/packregistry.xslt $(MISC)/$(@:b).list

File set_soenv.in

 ToFile( "SET_EXCEPTIONS",    $SET_EXCEPTIONS,    "e" );
 ToFile( "use_shl_versions",  $use_shl_versions,  "e" );
 ToFile( "FLIPCMD",           $FLIPCMD,           "e" );
+if ( $platform =~ m/darwin/ )
+{
+# MAXOSX_DEPLOYMENT_TARGET : The minimum version required to run the build,
+# build can assume functions/libraries of that version to be available
+# 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
+    ToFile( "MACOSX_DEPLOYMENT_TARGET",       "10.4",       "e" );
+}
+
 #
 # Writing the variables to file.
 # (c = comment, e = environment variable, a = alias, n = newline )

File solenv/config/sdev300.ini

             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
             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
             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
             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
             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
             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

File solenv/gbuild/AllLangResTarget.mk

 	$(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})

File solenv/gbuild/TargetLocations.mk

 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
 	LinkTarget \
 	SrsPartTarget \
 	SrsTarget \
-	PrecompiledHeader \
-	NoexPrecompiledHeader \
 ))
 
 

File solenv/gbuild/platform/macosx.mk

 gb_CPUDEFS := -DPOWERPC -DPPC
 endif
 
-ifeq ($(SYSBASE), "")
+ifeq ($(strip $(SYSBASE)),)
 gb_SDKDIR := /Developer/SDKs/MacOSX10.4u.sdk
 else
 gb_SDKDIR := $(SYSBASE)/MacOSX10.4u.sdk
 
 gb_Library_PLAINLIBS_NONE += \
 	Cocoa \
- 	objc \
+	objc \
 	jpeg \
 	m \
 	pthread \

File solenv/inc/unxmacx.mk

 # 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

File svx/prj/makefile.mk

-all:
-	cd .. && make -srj9

File toolkit/AllLangResTarget_tk.mk

 
 $(eval $(call gb_AllLangResTarget_AllLangResTarget,tk))
 
-$(eval $(call gb_AllLangResTarget_set_reslocation,tk,toolkit/source/awt))
+$(eval $(call gb_AllLangResTarget_set_reslocation,tk,toolkit))
 
 $(eval $(call gb_AllLangResTarget_add_srs,tk,\
 	toolkit/awt \