From d7add7597ced311c733839183aeb689335154f3b Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Fri, 10 Jul 2009 16:31:49 +0200 Subject: #i103452#: remove obsolete PRODUCT_FULL and HDEFS --- solenv/inc/settings.mk | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'solenv') diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk index a3c43edaaf67..94d158e57b1d 100644 --- a/solenv/inc/settings.mk +++ b/solenv/inc/settings.mk @@ -191,7 +191,6 @@ CDEFSPROF= CDEFSDEBUG= CDEFSDBGUTIL= CDEFSOPT= -HDEFS= CFLAGS= CFLAGSCALL= @@ -933,7 +932,6 @@ CDEFSDEBUG=-DDEBUG .ENDIF CDEFSDBGUTIL=-DDBG_UTIL CDEFSOPT=-DOPTIMIZE -HDEFS=-D:$(GUI) -D:$(COM) MKDEPFLAGS+=-I$(INCDEPN:s/ / -I/:s/-I-I/-I/) MKDEPALLINC=$(SOLARINC:s/-I/ -I/) @@ -1128,11 +1126,8 @@ RSCDEFS+=-DDBG_UTIL .IF "$(product)"!="" CDEFS+= -DPRODUCT -DNDEBUG -HDEFS+= -D:PRODUCT RSCDEFS+= -DPRODUCT -CDEFS+=-DPRODUCT_FULL -HDEFS+=-D:PRODUCT_FULL -RSCDEFS+= -DPRODUCT_FULL -DNDEBUG +RSCDEFS+= -DNDEBUG .ENDIF .IF "$(DBG_LEVEL)"!="" -- cgit From d13a606f632a1542606e1594cf7b5e2e70e462bb Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Tue, 28 Jul 2009 16:22:28 +0200 Subject: reenable pch for sw --- solenv/inc/rules.mk | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) (limited to 'solenv') diff --git a/solenv/inc/rules.mk b/solenv/inc/rules.mk index 0496b949bf92..4f42fa67a4e4 100644 --- a/solenv/inc/rules.mk +++ b/solenv/inc/rules.mk @@ -1,7 +1,7 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # Copyright 2008 by Sun Microsystems, Inc. # # OpenOffice.org - a multi-platform office productivity suite @@ -37,16 +37,16 @@ $(OBJ)$/%.obj : %.cxx .IF "$(GUI)"=="UNX" @$(RM) $@ $(@:s/.obj/.o/) $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx -.IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"=="" -.IF "$(noadjust)"=="" +.IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"=="" +.IF "$(noadjust)"=="" $(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/) -.ENDIF # "$(noadjust)"=="" -.ENDIF # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"=="" +.ENDIF # "$(noadjust)"=="" +.ENDIF # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"=="" $(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI) .ELSE @@-$(RM) $@ .IF "$(COM)"=="GCC" - $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx + $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx .ELSE $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx .ENDIF @@ -62,14 +62,14 @@ $(OBJ)$/%.obj : %.cpp .IF "$(GUI)"=="UNX" @$(RM) $@ $(@:s/.obj/.o/) $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $(CFLAGSINCXX)$(PWD)$/$*.cpp -.IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"=="" +.IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"=="" $(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/) -.ENDIF # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"=="" +.ENDIF # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"=="" $(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI) .ELSE @@-$(RM) $@ .IF "$(COM)"=="GCC" - $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cpp + $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cpp .ELSE $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cpp .ENDIF @@ -85,14 +85,14 @@ $(OBJ)$/%.obj : %.cc .IF "$(GUI)"=="UNX" @$(RM) $@ $(@:s/.obj/.o/) $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $(CFLAGSINCXX)$(PWD)$/$*.cc -.IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"=="" +.IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"=="" $(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/) -.ENDIF # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"=="" +.ENDIF # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"=="" +$(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI) .ELSE @@$(RM) $@ .IF "$(COM)"=="GCC" - $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cc + $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cc .ELSE $(CXX) @$(mktmp $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cc ) .ENDIF @@ -113,7 +113,7 @@ $(SLO)$/precompiled.% .PHONY: .IF "$(NETWORK_BUILD)"!="" -$(MKDIRHIER) $(PCHOUTDIR) .IF "$(HAVE_BIG_TMP)"=="" - -$(COPY) $(SLO)$/pch$/precompiled_$(PRJNAME).hxx$(PCHPOST) $(PCHOUTDIR)$/precompiled_$(PRJNAME).hxx$(PCHPOST) + -$(COPY) $(SLO)$/pch$/precompiled_$(PRJNAME).hxx$(PCHPOST) $(PCHOUTDIR)$/precompiled_$(PRJNAME).hxx$(PCHPOST) .ENDIF # "$(HAVE_BIG_TMP)"=="" .ENDIF # "$(NETWORK_BUILD)"!="" $(CXX) @$(mktmp -Fp$(PCHOUTDIR)$/precompiled_$(PRJNAME).hxx$(PCHPOST) $(CFLAGS_CREATE_PCH) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGS_NO_EXCEPTIONS) -DEXCEPTIONS_OFF $(CFLAGSAPPEND) $(INCPCH)$/precompiled_$(PRJNAME).cxx) @@ -138,7 +138,7 @@ $(SLO)$/precompiled_ex.% .PHONY: .IF "$(NETWORK_BUILD)"!="" -$(MKDIRHIER) $(PCHEXOUTDIR) .IF "$(HAVE_BIG_TMP)"=="" - -$(COPY) $(SLO)$/pch_ex$/precompiled_$(PRJNAME).hxx$(PCHPOST) $(PCHEXOUTDIR)$/precompiled_$(PRJNAME).hxx$(PCHPOST) + -$(COPY) $(SLO)$/pch_ex$/precompiled_$(PRJNAME).hxx$(PCHPOST) $(PCHEXOUTDIR)$/precompiled_$(PRJNAME).hxx$(PCHPOST) .ENDIF # "$(HAVE_BIG_TMP)"=="" .ENDIF # "$(NETWORK_BUILD)"!="" $(CXX) @$(mktmp -Fp$(PCHEXOUTDIR)$/precompiled_$(PRJNAME).hxx$(PCHPOST) $(CFLAGS_CREATE_PCH:s/pchname/pchname_ex/) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSEXCEPTIONS) -DEXCEPTIONS_ON $(CFLAGSAPPEND) $(INCPCH)$/precompiled_$(PRJNAME).cxx) @@ -164,8 +164,8 @@ $(SLO)$/precompiled_ex.% .PHONY: $(SLO)$/%.obj : %.cxx @echo ------------------------------ @echo Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$< -.IF "$(ENABLE_PCH)"!="" && ( "$(PRJNAME)"!="sw" || "$(BUILD_SPECIAL)"!="TRUE" ) -# just a helper var +.IF "$(ENABLE_PCH)"!="" # && ( "$(PRJNAME)"!="sw" || "$(BUILD_SPECIAL)"!="TRUE" ) +# just a helper var @noop $(assign used_exc_switches=$(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS))) # cleanup first @noop $(assign ACT_PCH_SWITCHES:=$(NULL)) @@ -184,7 +184,7 @@ $(SLO)$/%.obj : %.cxx $(CAPTURE_COMMAND) $(CXX) $(ACT_PCH_SWITCHES) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx $(CAPTURE_OUTPUT) .IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"=="" && "$(CAPTURE_COMMAND)"=="" $(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/) -.ENDIF # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"=="" +.ENDIF # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"=="" $(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI) .ENDIF .ELSE # "$(GUI)"=="UNX" @@ -193,7 +193,7 @@ $(SLO)$/%.obj : %.cxx $(CAPTURE_COMMAND) $(CXX) $(ACT_PCH_SWITCHES) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx $(CAPTURE_OUTPUT) .ELSE $(CAPTURE_COMMAND) $(CXX) $(ACT_PCH_SWITCHES) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx $(CAPTURE_OUTPUT) -.ENDIF # "$(COM)"=="GCC" +.ENDIF # "$(COM)"=="GCC" .ENDIF # "$(GUI)"=="UNX" .IF "$(nodep)"=="" # fixme: write to file -- cgit From febdf577f7716df95e9d7e7edf15baaa2bfdf4a5 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Mon, 14 Sep 2009 19:06:55 +0200 Subject: #i103496#: split cppunit in a pure external lib and a lib depending on sal -> testshl2 --- solenv/inc/libs.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'solenv') diff --git a/solenv/inc/libs.mk b/solenv/inc/libs.mk index 1ae4eeb9d11d..e71abf1ba16f 100644 --- a/solenv/inc/libs.mk +++ b/solenv/inc/libs.mk @@ -1,7 +1,7 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # Copyright 2008 by Sun Microsystems, Inc. # # OpenOffice.org - a multi-platform office productivity suite @@ -270,6 +270,7 @@ JVMACCESSLIB = -ljvmaccess$(UDK_MAJOR)$(COMID) JVMACCESSLIB = -ljvmaccess$(COMID) .ENDIF # "$(GUI)$(COM)"=="WNTGCC" CPPUNITLIB = -lcppunit$(DLLPOSTFIX) +TESTSHL2LIB = -ltestshl2$(DLLPOSTFIX) .IF "$(SYSTEM_LIBXSLT)"=="YES" XSLTLIB=$(LIBXSLT_LIBS) .ELSE @@ -473,6 +474,7 @@ HELPLINKERLIB=ihelplinker.lib SYSSHELLLIB=sysshell.lib JVMACCESSLIB = ijvmaccess.lib CPPUNITLIB = cppunit.lib +TESTSHL2LIB = testshl2.lib XSLTLIB = libxslt.lib $(ZLIB3RDLIB) $(LIBXML2LIB) .IF "$(GUI)"=="OS2" REDLANDLIB = raptor.a rasqal.a rdf.a $(LIBXML2LIB) $(OPENSSLLIB) pthread.lib -- cgit From 060fbe871de563db705d1ab5d2510fbe056ab593 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Mon, 28 Sep 2009 17:16:08 +0200 Subject: regression from sb113: redland does not build from scratch --- solenv/inc/libs.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'solenv') diff --git a/solenv/inc/libs.mk b/solenv/inc/libs.mk index 585768b7b542..7e9e7239550c 100644 --- a/solenv/inc/libs.mk +++ b/solenv/inc/libs.mk @@ -273,7 +273,7 @@ TESTSHL2LIB = -ltestshl2$(DLLPOSTFIX) .IF "$(SYSTEM_LIBXSLT)"=="YES" XSLTLIB=$(LIBXSLT_LIBS) .ELSE -XSLTLIB=-lxslt $(ZLIB3RDLIB) $(LIBXML2LIB) +XSLTLIB=-lxslt $(LIBXML2LIB) .ENDIF .IF "$(GUI)$(COM)"=="WNTGCC" JVMFWKLIB = -ljvmfwk$(UDK_MAJOR) @@ -477,7 +477,7 @@ SYSSHELLLIB=sysshell.lib JVMACCESSLIB = ijvmaccess.lib CPPUNITLIB = cppunit.lib TESTSHL2LIB = testshl2.lib -XSLTLIB = libxslt.lib $(ZLIB3RDLIB) $(LIBXML2LIB) +XSLTLIB = libxslt.lib $(LIBXML2LIB) .IF "$(GUI)"=="OS2" REDLANDLIB = raptor.a rasqal.a rdf.a $(LIBXML2LIB) $(OPENSSLLIB) pthread.lib .ELSE -- cgit From d763f15f1f81872d6fd0f9a10d10b90238ed2b23 Mon Sep 17 00:00:00 2001 From: sb Date: Tue, 13 Oct 2009 13:09:45 +0200 Subject: #i105348# get rid of LinuxThread-specific code (NPTL define) --- solenv/config/sdev300.ini | 2 -- solenv/config/ssolar.cmn | 1 - solenv/inc/unxlng.mk | 2 +- 3 files changed, 1 insertion(+), 4 deletions(-) (limited to 'solenv') diff --git a/solenv/config/sdev300.ini b/solenv/config/sdev300.ini index 8b65e8b111e9..afe5aac44201 100644 --- a/solenv/config/sdev300.ini +++ b/solenv/config/sdev300.ini @@ -1000,7 +1000,6 @@ unxlngx6 DEVROOT %SOLAR_ENV_ROOT% PERL %SOLAR_ENV_ROOT%/bt_linux_libc2.11/%WORK_STAMP%/bin/perl PKGFORMAT rpm - PTHREAD_CFLAGS -DNPTL SHARED_SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/src%UPDMINOREXT%/solenv SHARED_SOLARVERSION %SOLAR_SOURCE_ROOT%/%WORK_STAMP% SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/src%UPDMINOREXT%/solenv @@ -2529,7 +2528,6 @@ unxubti8 PAM_LINK NO PERL /usr/bin/perl PKGFORMAT deb - PTHREAD_CFLAGS -DNPTL SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/src%UPDMINOREXT%/solenv SOLARROOT %SOLAR_ENV_ROOT% SOLARVER %SOLAR_SOURCE_ROOT%/%WORK_STAMP% diff --git a/solenv/config/ssolar.cmn b/solenv/config/ssolar.cmn index dca20cc902b1..039bdcfcc898 100644 --- a/solenv/config/ssolar.cmn +++ b/solenv/config/ssolar.cmn @@ -169,7 +169,6 @@ common PROFILE profile PROSWITCH - PTHREAD_CFLAGS REMOTE_BUILD_FLAG RES_ARAB RES_CHINSIM diff --git a/solenv/inc/unxlng.mk b/solenv/inc/unxlng.mk index a79d3e47c6cf..b496da7917da 100644 --- a/solenv/inc/unxlng.mk +++ b/solenv/inc/unxlng.mk @@ -47,7 +47,7 @@ JAVAFLAGSDEBUG=-g #LINKOUTPUT_FILTER=" |& $(SOLARENV)/bin/msg_filter" # _PTHREADS is needed for the stl -CDEFS+=$(PTHREAD_CFLAGS) -DGLIBC=2 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=$(STLPORT_VER) +CDEFS+=-DGLIBC=2 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=$(STLPORT_VER) # enable visibility define in "sal/types.h" .IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE" -- cgit From d02b19b2ffddfba220cbbfee4da15093ede10d84 Mon Sep 17 00:00:00 2001 From: sb Date: Tue, 13 Oct 2009 14:03:56 +0200 Subject: #i105059# removed PYTHONPATH from build environment --- solenv/config/ssolar.cmn | 1 - 1 file changed, 1 deletion(-) (limited to 'solenv') diff --git a/solenv/config/ssolar.cmn b/solenv/config/ssolar.cmn index 039bdcfcc898..622ff9390de7 100644 --- a/solenv/config/ssolar.cmn +++ b/solenv/config/ssolar.cmn @@ -268,7 +268,6 @@ common NO_HIDS PAM_LINK PAM - PYTHONPATH SOLAR_PLUGIN URE_BOOTSTRAP USE_FT_EMBOLDEN -- cgit From 889713fba4c188aa5ef66372b2e888e5d4ce4048 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Fri, 16 Oct 2009 00:05:16 +0200 Subject: #i103496#: split svtools; improve ConfitItems --- solenv/bin/build.pl | 0 solenv/bin/gccinstlib.pl | 0 2 files changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 solenv/bin/build.pl mode change 100644 => 100755 solenv/bin/gccinstlib.pl (limited to 'solenv') diff --git a/solenv/bin/build.pl b/solenv/bin/build.pl old mode 100644 new mode 100755 diff --git a/solenv/bin/gccinstlib.pl b/solenv/bin/gccinstlib.pl old mode 100644 new mode 100755 -- cgit From 3a3ad68fbdd60f9f913cb764a42fff20f8d0c51b Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Sat, 31 Oct 2009 00:29:04 +0100 Subject: #i106421#: move msfilter to filter --- solenv/inc/libs.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'solenv') diff --git a/solenv/inc/libs.mk b/solenv/inc/libs.mk index fc58ab122be7..83e5755f5bc3 100644 --- a/solenv/inc/libs.mk +++ b/solenv/inc/libs.mk @@ -240,7 +240,7 @@ SFXDEBUGLIB= FWELIB=-lfwe$(DLLPOSTFIX) FWILIB=-lfwi$(DLLPOSTFIX) SVXCORELIB=-lsvxcore$(DLLPOSTFIX) -SVXMSFILTERLIB=-lsvxmsfilter$(DLLPOSTFIX) +MSFILTERLIB=-lmsfilter$(DLLPOSTFIX) SVXLIB=-lsvx$(DLLPOSTFIX) BASCTLLIB=-lbasctl$(DLLPOSTFIX) BASICIDELIB=-lybctl @@ -425,7 +425,7 @@ DOCMGRLIB=docmgr.lib BASICLIB=basic.lib TKTLIB=tkt.lib SVXCORELIB=isvxcore.lib -SVXMSFILTERLIB=isvxmsfilter.lib +MSFILTERLIB=imsfilter.lib SVXLIB=isvx.lib BASCTLLIB=basctl.lib BASICIDELIB=ybctl.lib -- cgit From 40ca7ca4cc6ebed1e769a151b6eeb8af290ef591 Mon Sep 17 00:00:00 2001 From: mb93783 Date: Tue, 3 Nov 2009 18:41:58 +0100 Subject: some fixes for warnings and errors found while building on more platforms --- solenv/config/sdev300.ini | 1348 ++++++++++++++++++++++----------------------- 1 file changed, 674 insertions(+), 674 deletions(-) mode change 100644 => 100755 solenv/config/sdev300.ini (limited to 'solenv') diff --git a/solenv/config/sdev300.ini b/solenv/config/sdev300.ini old mode 100644 new mode 100755 index 6d3a0961fbe4..816815b67f53 --- a/solenv/config/sdev300.ini +++ b/solenv/config/sdev300.ini @@ -1,12 +1,12 @@ -common +common { - environment + environment { - btarget + btarget { BTARGET btarget=%BUILD_TARGET% } - common + common { ADDED_MODULES solenv default_images custom_images ooo_custom_images external_images postprocess instset_native instsetoo_native smoketest_native smoketestoo_native BIG_SVX TRUE @@ -70,7 +70,7 @@ common { ENABLE_CRASHDUMP DUMMY } - crashdump + crashdump { ENABLE_CRASHDUMP STATIC } @@ -78,7 +78,7 @@ common { MAXPROC maxproc=%MAXPROCESS% } - nojava + nojava { DISABLE_JAVA TRUE } @@ -97,68 +97,68 @@ common PROEXT .pro PROFULLSWITCH product=full } - shell + shell { SHELL %STAR_USE_SHELL% USE_SHELL %STAR_USE_SHELL% } - tmp + tmp { SOL_TMP %SOL_TMP_DIR% } - verbose + verbose { VERBOSE VERBOSE } - zipsource + zipsource { ZIPSOURCE zipsource=%ZIP_SOURCE_URL% } } - extern + extern { - ENVROOT - PATH - SRC_ROOT - STL_ROOT - UPDATER + ENVROOT + PATH + SRC_ROOT + STL_ROOT + UPDATER } order common:2 common:3 pro:0 pro:1 common common:0 btarget zipsource cwsname common:1 nojava shell tmp crashdump maxproc - reset + reset { - ENVCFLAGS - HOMEDRIVE - HOMEPATH - JAVAHOME - JAVA_HOME + ENVCFLAGS + HOMEDRIVE + HOMEPATH + JAVAHOME + JAVA_HOME MKDIRHIER - PROEXT - PROFULLSWITCH - SHIPDRIVE - SOLARSRC - SOLAR_JAVA - SPEW + PROEXT + PROFULLSWITCH + SHIPDRIVE + SOLARSRC + SOLAR_JAVA + SPEW STLPORT4 WITH_FONTOOO WITH_LANG } - restore + restore { - PATH + PATH } - standlst + standlst { DRIVE_O %WORK_STAMP%/drives/o:/UnixVolume DRIVE_S %WORK_STAMP%/drives/s:/UnixVolume } - switches + switches { btarget BUILD_TARGET - crashdump + crashdump cwsname CWS_WORK_STAMP - envroot - nojava - pro + envroot + nojava + pro maxproc MAXPROCESS shell STAR_USE_SHELL tmp SOL_TMP_DIR @@ -166,34 +166,34 @@ common zipsource ZIP_SOURCE_URL } } -finish +finish { - environment + environment { - ca + ca { SOLARSRC %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/src%UPDMINOREXT% } - cap + cap { SOLARSRC %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/src%UPDMINOREXT% } - cax + cax { SOLARSRC %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/src%UPDMINOREXT% } common_0:0 IF %OS% == MACOSX { - ENABLE_GCONF - ENABLE_GNOMEVFS - ENABLE_GTK + ENABLE_GCONF + ENABLE_GNOMEVFS + ENABLE_GTK SOLARINCLUDES -I%SOLARVERSION%$/%INPATH%$/inc%UPDMINOREXT% -I%SOLARENV%$/%OUTPATH%$/inc -I%SOLARENV%$/inc %SOLAREXTRAINC% } common_0:3 IF %SOLARINCLUDES% == { SOLARINCLUDES -I%SOLARVERSION%$/%INPATH%$/inc%UPDMINOREXT% %PSDKINC% -I%COMPATH%$/include -I%SOLARENV%$/inc %SOLAREXTRAINC% } - common_1 + common_1 { BISON_HAIRY %SOLARROOT%$/btools$/bison.hairy BISON_SIMPLE %SOLARROOT%$/btools$/bison.simple @@ -222,8 +222,8 @@ finish } cwsname:0 IF X%SOURCE_ROOT_USED%X == XX { - *build - *deliver + *build + *deliver DMAKEROOT SOURCE_ROOT_not_used SOLARINC SOURCE_ROOT_not_used SOLARINCLUDE SOURCE_ROOT_not_used @@ -237,8 +237,8 @@ finish } cwsname:1 IF X%SOURCE_ROOT%X == XX { - *build - *deliver + *build + *deliver DMAKEROOT SOURCE_ROOT_not_set SOLARINC SOURCE_ROOT_not_set SOLARINCLUDE SOURCE_ROOT_not_set @@ -252,8 +252,8 @@ finish } cwsname:2 IF X%UPDMINOR%X == XX { - *build - *deliver + *build + *deliver DMAKEROOT UPDMINOR_not_used SOLARINC UPDMINOR_not_used SOLARINCLUDE UPDMINOR_not_used @@ -265,30 +265,30 @@ finish SO_GEN_ERROR2 ...resetting path to source tree SRC_ROOT UPDMINOR_not_used } - jdk13 + jdk13 { CLASSPATH .$;%JAVA_HOME%$/jre$/lib$/rt.jar ILIB %LIB%$;%JDKLIB% LIB %LIB%$;%JDKLIB% } - jdk14 + jdk14 { CLASSPATH .$;%JAVA_HOME%$/jre$/lib$/rt.jar ILIB %LIB%$;%JDKLIB% LIB %LIB%$;%JDKLIB% } - jdk15 + jdk15 { CLASSPATH .$;%JAVA_HOME%$/jre$/lib$/rt.jar ILIB %LIB%$;%JDKLIB% LIB %LIB%$;%JDKLIB% } - l10n + l10n { framework %L10N_framework% L10N-framework %L10N_framework% } - ojdk16 + ojdk16 { CLASSPATH .$;%JAVA_HOME%$/jre$/lib$/rt.jar ILIB %LIB%$;%JDKLIB% @@ -296,22 +296,22 @@ finish } } order cwsname:0 cwsname:1 cwsname:2 common_0:0 common_0:1 common_0:2 common_0:3 jdk13 jdk14 jdk15 ojdk16 common_1 common_2:0 l10n common_jre:0 common_jre:1 ca cax cap common_a - switches + switches { cwsname CWS_WORK_STAMP } } -unxfbsdi +unxfbsdi { - environment + environment { - bs_sourceroot + bs_sourceroot { SOLAR_SOURCE_ROOT %SOURCE_ROOT_TMP% SOURCE_ROOT %SOURCE_ROOT_TMP% SOURCE_ROOT_USED TRUE } - ca + ca { COPYALL TRUE DEVROOT %SOL_TMP%$/r @@ -321,7 +321,7 @@ unxfbsdi SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP% SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP% } - cap + cap { COPYALL TRUE COPY_PACKED TRUE @@ -333,7 +333,7 @@ unxfbsdi SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP% SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP% } - cax + cax { COPYALL FALSE DEVROOT %SOL_TMP%$/r @@ -344,7 +344,7 @@ unxfbsdi SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP% SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP% } - common + common { *build nice perl %SOLARENV%/bin/build.pl %PROFULLSWITCH% *build_client nice perl %SOLARENV%/bin/build_client.pl @@ -365,12 +365,12 @@ unxfbsdi SOLAR_JAVA TRUE ZIPDEP perl %SOLARENV%/bin/zipdep.pl } - common0 + common0 { SOLAR_ENV_ROOT /so/env SOLAR_SOURCE_ROOT %DRIVE_O% } - common1 + common1 { COMPATH %SOLAR_ENV_ROOT%$/gcc_3.0.1_linux_libc2.11_turbolinux DEVROOT %SOLAR_ENV_ROOT% @@ -387,7 +387,7 @@ unxfbsdi SO_PACK %SOLAR_ENV_ROOT%/pack/%WORK_STAMP% SRC_ROOT %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/src%UPDMINOREXT% } - common2 + common2 { BUILD_TOOLS %SOLARROOT%/bt_unxfbsdi/bin COM GCC @@ -413,11 +413,11 @@ unxfbsdi TEMP /tmp TMP /tmp } - compath + compath { COMPATH %STAR_COMPATH% } - debug + debug { LD_LIBRARY_PATH %SOLARROOT%/solenv/unxlngi4/lib/debug:%LD_LIBRARY_PATH% } @@ -431,7 +431,7 @@ unxfbsdi { SOLAR_ENV_ROOT %ENV_ROOT% } - jdk13 + jdk13 { JAVA_HOME %JDK13PATH% JDKINC %JDK13PATH%/include:%JDK13PATH%/include/linux @@ -446,7 +446,7 @@ unxfbsdi { SOLAR_JDK13PATH %JDK_PATH% } - jdk14 + jdk14 { JAVA_HOME %JDK14PATH% JDKINC %JDK14PATH%/include:%JDK14PATH%/include/linux @@ -461,7 +461,7 @@ unxfbsdi { SOLAR_JDK14PATH %JDK_PATH% } - jdk15 + jdk15 { JAVA_HOME %JDK15PATH% JDKINC %JDK15PATH%/include:%JDK15PATH%/include/linux @@ -476,11 +476,11 @@ unxfbsdi { SOLAR_JDK15PATH %JDK_PATH% } - nativecvs + nativecvs { *cvs %STAR_NATIVECVS% } - pre + pre { ILIB %PRE%/lib:%ILIB% LD_LIBRARY_PATH %PRE%/lib:%LD_LIBRARY_PATH% @@ -488,7 +488,7 @@ unxfbsdi SOLARINC -I. -I%PRE%/inc %SOLARINC% SOLARLIB -L%PRE%/lib %SOLARLIB% -L/usr/X11R6/lib } - pro + pro { PROSWITCH -DPRODUCT } @@ -506,39 +506,39 @@ unxfbsdi { SOLAR_STLPATH %SOLARVERSION%$/%INPATH%$/inc%UPDMINOREXT%$/stl } - sysbaseroot + sysbaseroot { SOLAR_SYSBASE_ROOT %SYSBASE_ROOT% } } - extern + extern { - DIST_ROOT - ENV_ROOT - HOME - JDK_PATH - LOCALINI - SOL_TMP - SOURCE_ROOT - STL_ROOT - SYSBASE_ROOT - USER + DIST_ROOT + ENV_ROOT + HOME + JDK_PATH + LOCALINI + SOL_TMP + SOURCE_ROOT + STL_ROOT + SYSBASE_ROOT + USER } order common0 bs_sourceroot envroot:0 sourceroot:0 sysbaseroot common1 jdk13path:0 jdk14path:0 jdk15path:0 distroot:0 nativecvs ca cap cax compath common2 pro stl:0 stl:1 common jdk13 jdk14 jdk15 debug pre - reset + reset { - CLASSPATH - COPYALL + CLASSPATH + COPYALL } - restore + restore { - INCLUDE + INCLUDE } - script + script { - csh + csh { - 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC + 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pk all $ZIPSOURCE $BTARGET $MAXPROC 600: umask 002 800: rehash 850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR @@ -546,10 +546,10 @@ unxfbsdi 900: if ( "$?SO_GEN_ERROR" == 1 ) echo $SO_GEN_ERROR 901: if ( "$?SO_GEN_ERROR2" == 1 ) echo $SO_GEN_ERROR2 } - sh + sh { 400: if [ $COPYALL ]; then - 410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC + 410: $SOLAR_ENV_ROOT/etools/lucopy.pk all $ZIPSOURCE $BTARGET $MAXPROC 415: fi 600: umask 002 800: hash -r @@ -567,43 +567,43 @@ unxfbsdi 882: fi } } - switches + switches { bs_sourceroot SOURCE_ROOT_TMP - bsclient - ca - cap - cax + bsclient + ca + cap + cax compath STAR_COMPATH - debug - distroot - envroot - jdk13 - jdk13path - jdk14 - jdk14path - jdk15 - jdk15path + debug + distroot + envroot + jdk13 + jdk13path + jdk14 + jdk14path + jdk15 + jdk15path l10n L10N_framework nativecvs STAR_NATIVECVS pre PRE - pro - sourceroot - stl - sysbaseroot + pro + sourceroot + stl + sysbaseroot } } -unxlngi6 +unxlngi6 { - environment + environment { - bs_sourceroot + bs_sourceroot { SOLAR_SOURCE_ROOT %SOURCE_ROOT_TMP% SOURCE_ROOT %SOURCE_ROOT_TMP% SOURCE_ROOT_USED TRUE } - ca + ca { COPYALL TRUE DEVROOT %SOL_TMP%$/r @@ -614,7 +614,7 @@ unxlngi6 SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP% SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP% } - cap + cap { COPYALL TRUE COPY_PACKED TRUE @@ -627,7 +627,7 @@ unxlngi6 SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP% SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP% } - cax + cax { COPYALL FALSE DEVROOT %SOL_TMP%$/r @@ -639,7 +639,7 @@ unxlngi6 SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP% SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP% } - common + common { *build nice %PERL% %SOLARENV%/bin/build.pl %PROFULLSWITCH% *build_client nice %PERL% %SOLARENV%/bin/build_client.pl @@ -663,15 +663,15 @@ unxlngi6 SOLAR_JAVA TRUE ZIPDEP %PERL% %SOLARENV%/bin/zipdep.pl } - common0 + common0 { SOLAR_ENV_ROOT /so/env SOLAR_SOURCE_ROOT %DRIVE_O% - SOLAR_SYSBASE_ROOT /so/env/gcc_4.2.3_linux_libc2.32/glibc2.3.2 + SOLAR_SYSBASE_ROOT /so/env/gcc_4.2.3_linux_libc2.32/glibc2.3.2 } - common1 + common1 { - COMPATH %SOLAR_ENV_ROOT%$/gcc_4.2.3_linux_libc2.32 + COMPATH %SOLAR_ENV_ROOT%$/gcc_4.2.3_linux_libc2.32 DEVROOT %SOLAR_ENV_ROOT% LFS_CFLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 PERL %SOLAR_ENV_ROOT%/bt_linux_libc2.32/%WORK_STAMP%/bin/perl @@ -689,7 +689,7 @@ unxlngi6 SO_PACK %SOLAR_ENV_ROOT%/pack/%WORK_STAMP% SRC_ROOT %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/src%UPDMINOREXT% } - common2 + common2 { ENABLE_GRAPHITE TRUE BUILD_TOOLS %SOLARROOT%/bt_linux_libc2.32/%WORK_STAMP%/bin @@ -726,7 +726,7 @@ unxlngi6 { FORCE2ARCHIVE TRUE } - compath + compath { COMPATH %STAR_COMPATH% } @@ -740,7 +740,7 @@ unxlngi6 { SOLAR_ENV_ROOT %ENV_ROOT% } - jdk13 + jdk13 { JAVA_HOME %JDK13PATH% JDKINC %JDK13PATH%/include:%JDK13PATH%/include/linux @@ -755,7 +755,7 @@ unxlngi6 { SOLAR_JDK13PATH %JDK_PATH% } - jdk14 + jdk14 { JAVA_HOME %JDK14PATH% JDKINC %JDK14PATH%/include:%JDK14PATH%/include/linux @@ -770,7 +770,7 @@ unxlngi6 { SOLAR_JDK14PATH %JDK_PATH% } - jdk15 + jdk15 { JAVA_HOME %JDK15PATH% JDKINC %JDK15PATH%/include:%JDK15PATH%/include/linux @@ -785,11 +785,11 @@ unxlngi6 { SOLAR_JDK15PATH %JDK_PATH% } - nativecvs + nativecvs { *cvs %STAR_NATIVECVS% } - ojdk16 + ojdk16 { JAVA_HOME %OJDK16PATH% JDKINC %OJDK16PATH%/include:%OJDK16PATH%/include/linux @@ -804,14 +804,14 @@ unxlngi6 { SOLAR_OJDK16PATH %JDK_PATH% } - pre + pre { ILIB %PRE%/lib:%ILIB% LIB %PRE%/lib:%LIB% SOLARINC -I. -I%PRE%/inc %SOLARINC% SOLARLIB -L%PRE%/lib %SOLARLIB% -L/usr/X11R6/lib } - pro + pro { PROSWITCH -DPRODUCT } @@ -829,39 +829,39 @@ unxlngi6 { SOLAR_STLPATH %SOLARVERSION%$/%INPATH%$/inc%UPDMINOREXT%$/stl } - sysbaseroot + sysbaseroot { SOLAR_SYSBASE_ROOT %SYSBASE_ROOT% } } - extern + extern { - DIST_ROOT - ENV_ROOT - HOME - JDK_PATH - LOCALINI - SOL_TMP - SOURCE_ROOT - STL_ROOT - SYSBASE_ROOT - USER + DIST_ROOT + ENV_ROOT + HOME + JDK_PATH + LOCALINI + SOL_TMP + SOURCE_ROOT + STL_ROOT + SYSBASE_ROOT + USER } order common0 bs_sourceroot envroot:0 sourceroot:0 sysbaseroot common1 jdk13path:0 jdk14path:0 jdk15path:0 ojdk16path:0 distroot:0 nativecvs ca cap cax compath common2 pro common3:0 stl:0 stl:1 common jdk13 jdk14 jdk15 ojdk16 pre - reset + reset { - CLASSPATH - COPYALL + CLASSPATH + COPYALL } - restore + restore { - INCLUDE + INCLUDE } - script + script { - csh + csh { - 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC + 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pk all $ZIPSOURCE $BTARGET $MAXPROC 600: umask 002 800: rehash 850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR @@ -869,10 +869,10 @@ unxlngi6 900: if ( "$?SO_GEN_ERROR" == 1 ) echo $SO_GEN_ERROR 901: if ( "$?SO_GEN_ERROR2" == 1 ) echo $SO_GEN_ERROR2 } - sh + sh { 400: if [ $COPYALL ]; then - 410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC + 410: $SOLAR_ENV_ROOT/etools/lucopy.pk all $ZIPSOURCE $BTARGET $MAXPROC 415: fi 600: umask 002 800: hash -r @@ -890,45 +890,45 @@ unxlngi6 882: fi } } - switches + switches { bs_sourceroot SOURCE_ROOT_TMP - bsclient - ca - cap - cax + bsclient + ca + cap + cax compath STAR_COMPATH - debug - distroot - envroot - jdk13 - jdk13path - jdk14 - jdk14path - jdk15 - jdk15path + debug + distroot + envroot + jdk13 + jdk13path + jdk14 + jdk14path + jdk15 + jdk15path l10n L10N_framework nativecvs STAR_NATIVECVS - ojdk16 - ojdk16path + ojdk16 + ojdk16path pre PRE - pro - sourceroot - stl - sysbaseroot + pro + sourceroot + stl + sysbaseroot } } -unxlngx6 +unxlngx6 { - environment + environment { - bs_sourceroot + bs_sourceroot { SOLAR_SOURCE_ROOT %SOURCE_ROOT_TMP% SOURCE_ROOT %SOURCE_ROOT_TMP% SOURCE_ROOT_USED TRUE } - ca + ca { COPYALL TRUE DEVROOT %SOL_TMP%$/r @@ -939,7 +939,7 @@ unxlngx6 SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP% SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP% } - cap + cap { COPYALL TRUE COPY_PACKED TRUE @@ -952,7 +952,7 @@ unxlngx6 SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP% SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP% } - cax + cax { COPYALL FALSE DEVROOT %SOL_TMP%$/r @@ -964,7 +964,7 @@ unxlngx6 SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP% SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP% } - common + common { *build nice %PERL% %SOLARENV%/bin/build.pl %PROFULLSWITCH% *build_client nice %PERL% %SOLARENV%/bin/build_client.pl @@ -988,13 +988,13 @@ unxlngx6 SOLAR_JAVA TRUE ZIPDEP %PERL% %SOLARENV%/bin/zipdep.pl } - common0 + common0 { SOLAR_ENV_ROOT /so/env SOLAR_SOURCE_ROOT %DRIVE_O% SOLAR_SYSBASE_ROOT /so/env/gcc_4.2.3_linux64_libc3.4.6/glibc3.4.6 } - common1 + common1 { COMPATH %SOLAR_ENV_ROOT%$/gcc_4.2.3_linux64_libc3.4.6/ DEVROOT %SOLAR_ENV_ROOT% @@ -1015,7 +1015,7 @@ unxlngx6 USE_SYSTEM_STL YES XAU_LIBS -lXau } - common2 + common2 { ENABLE_GRAPHITE TRUE BUILD_TOOLS %SOLARROOT%/bt_linux_libc2.32/%WORK_STAMP%/bin @@ -1053,7 +1053,7 @@ unxlngx6 { FORCE2ARCHIVE TRUE } - compath + compath { COMPATH %STAR_COMPATH% } @@ -1067,7 +1067,7 @@ unxlngx6 { SOLAR_ENV_ROOT %ENV_ROOT% } - jdk14 + jdk14 { JAVA_HOME %JDK15PATH% JDKINC %JDK15PATH%/include:%JDK15PATH%/include/linux @@ -1082,7 +1082,7 @@ unxlngx6 { SOLAR_JDK14PATH %JDK_PATH% } - jdk15 + jdk15 { JAVA_HOME %JDK15PATH% JDKINC %JDK15PATH%/include:%JDK15PATH%/include/linux @@ -1097,11 +1097,11 @@ unxlngx6 { SOLAR_JDK15PATH %JDK_PATH% } - nativecvs + nativecvs { *cvs %STAR_NATIVECVS% } - ojdk16 + ojdk16 { JAVA_HOME %OJDK16PATH% JDKINC %OJDK16PATH%/include:%OJDK16PATH%/include/linux @@ -1116,14 +1116,14 @@ unxlngx6 { SOLAR_OJDK16PATH %JDK_PATH% } - pre + pre { ILIB %PRE%/lib:%ILIB% LIB %PRE%/lib:%LIB% SOLARINC -I. -I%PRE%/inc %SOLARINC% SOLARLIB -L%PRE%/lib %SOLARLIB% -L/usr/X11R6/lib } - pro + pro { PROSWITCH -DPRODUCT } @@ -1141,39 +1141,39 @@ unxlngx6 { SOLAR_STLPATH %SOLARVERSION%$/%INPATH%$/inc%UPDMINOREXT%$/stl } - sysbaseroot + sysbaseroot { SOLAR_SYSBASE_ROOT %SYSBASE_ROOT% } } - extern + extern { - DIST_ROOT - ENV_ROOT - HOME - JDK_PATH - LOCALINI - SOL_TMP - SOURCE_ROOT - STL_ROOT - SYSBASE_ROOT - USER + DIST_ROOT + ENV_ROOT + HOME + JDK_PATH + LOCALINI + SOL_TMP + SOURCE_ROOT + STL_ROOT + SYSBASE_ROOT + USER } order common0 bs_sourceroot envroot:0 sourceroot:0 sysbaseroot common1 jdk14path:0 jdk15path:0 ojdk16path:0 distroot:0 nativecvs ca cap cax compath common2 common3:0 pro stl:0 stl:1 common jdk14 jdk15 ojdk16 pre - reset + reset { - CLASSPATH - COPYALL + CLASSPATH + COPYALL } - restore + restore { - INCLUDE + INCLUDE } - script + script { - csh + csh { - 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC + 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pk all $ZIPSOURCE $BTARGET $MAXPROC 600: umask 002 800: rehash 850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR @@ -1181,10 +1181,10 @@ unxlngx6 900: if ( "$?SO_GEN_ERROR" == 1 ) echo $SO_GEN_ERROR 901: if ( "$?SO_GEN_ERROR2" == 1 ) echo $SO_GEN_ERROR2 } - sh + sh { 400: if [ $COPYALL ]; then - 410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC + 410: $SOLAR_ENV_ROOT/etools/lucopy.pk all $ZIPSOURCE $BTARGET $MAXPROC 415: fi 600: umask 002 800: hash -r @@ -1202,43 +1202,43 @@ unxlngx6 882: fi } } - switches + switches { bs_sourceroot SOURCE_ROOT_TMP - bsclient - ca - cap - cax + bsclient + ca + cap + cax compath STAR_COMPATH - debug - distroot - envroot - jdk14 - jdk14path - jdk15 - jdk15path + debug + distroot + envroot + jdk14 + jdk14path + jdk15 + jdk15path l10n L10N_framework nativecvs STAR_NATIVECVS - ojdk16 - ojdk16path + ojdk16 + ojdk16path pre PRE - pro - sourceroot - stl - sysbaseroot + pro + sourceroot + stl + sysbaseroot } } -unxmacxi +unxmacxi { - environment + environment { - bs_sourceroot + bs_sourceroot { SOLAR_SOURCE_ROOT %SOURCE_ROOT_TMP% SOURCE_ROOT %SOURCE_ROOT_TMP% SOURCE_ROOT_USED TRUE } - ca + ca { COPYALL TRUE DEVROOT %SOL_TMP%$/r @@ -1249,7 +1249,7 @@ unxmacxi SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP% SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP% } - cap + cap { COPYALL TRUE COPY_PACKED TRUE @@ -1262,7 +1262,7 @@ unxmacxi SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP% SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP% } - cax + cax { COPYALL FALSE DEVROOT %SOL_TMP%$/r @@ -1274,7 +1274,7 @@ unxmacxi SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP% SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP% } - common + common { *build nice %PERL% %SOLARENV%/bin/build.pl %PROFULLSWITCH% *build_client nice %PERL% %SOLARENV%/bin/build_client.pl @@ -1296,7 +1296,7 @@ unxmacxi SOLAR_JAVA TRUE ZIPDEP %PERL% %SOLARENV%/bin/zipdep.pl } - common0 + common0 { GXX_INCLUDE_PATH /so/env/gcc_4.0.1_macosx/usr/include/c++/4.0.0 SOLAR_ENV_ROOT /so/env @@ -1304,7 +1304,7 @@ unxmacxi SOLAR_SYSBASE_ROOT /so/env/gcc_4.0.1_macosx MACDEVSDK /so/env/gcc_4.0.1_macosx/MacOSX10.4u.sdk } - common1 + common1 { BUILD_OS_APPLEOSX TRUE BUILD_OS_MAJOR 10 @@ -1347,7 +1347,7 @@ unxmacxi BUILD_PIXMAN YES WITH_MOZILLA YES } - common2 + common2 { BUILD_TOOLS %SOLARROOT%/bt_macosx_intel/%WORK_STAMP%/bin COM GCC @@ -1374,7 +1374,7 @@ unxmacxi TEMP /tmp TMP /tmp } - compath + compath { COMPATH %STAR_COMPATH% } @@ -1388,7 +1388,7 @@ unxmacxi { SOLAR_ENV_ROOT %ENV_ROOT% } - jdk13 + jdk13 { JAVA_HOME %JDK13PATH% JDKINC %JDK13PATH%/include:%JDK13PATH%/include/linux @@ -1403,7 +1403,7 @@ unxmacxi { SOLAR_JDK13PATH %JDK_PATH% } - jdk14 + jdk14 { JAVA_HOME %JDK15PATH% JDKINC %JDK15PATH%/include:%JDK15PATH%/include/linux @@ -1418,7 +1418,7 @@ unxmacxi { SOLAR_JDK14PATH %JDK_PATH% } - jdk15 + jdk15 { JAVA_HOME %JDK15PATH% JDKINC %JDK15PATH%/include:%JDK15PATH%/include/linux @@ -1433,18 +1433,18 @@ unxmacxi { SOLAR_JDK15PATH %JDK_PATH% } - nativecvs + nativecvs { *cvs %STAR_NATIVECVS% } - pre + pre { ILIB %PRE%/lib:%ILIB% LIB %PRE%/lib:%LIB% SOLARINC -I. -I%PRE%/inc %SOLARINC% SOLARLIB -L%PRE%/lib %SOLARLIB% -L/usr/X11R6/lib } - pro + pro { PROSWITCH -DPRODUCT } @@ -1462,39 +1462,39 @@ unxmacxi { SOLAR_STLPATH %SOLARVERSION%$/%INPATH%$/inc%UPDMINOREXT%$/stl } - sysbaseroot + sysbaseroot { SOLAR_SYSBASE_ROOT %SYSBASE_ROOT% } } - extern + extern { - DIST_ROOT - ENV_ROOT - HOME - JDK_PATH - LOCALINI - SOL_TMP - SOURCE_ROOT - STL_ROOT - SYSBASE_ROOT - USER + DIST_ROOT + ENV_ROOT + HOME + JDK_PATH + LOCALINI + SOL_TMP + SOURCE_ROOT + STL_ROOT + SYSBASE_ROOT + USER } order common0 bs_sourceroot envroot:0 sourceroot:0 sysbaseroot common1 jdk13path:0 jdk14path:0 jdk15path:0 distroot:0 nativecvs ca cap cax compath common2 pro stl:0 stl:1 common jdk13 jdk14 jdk15 pre - reset + reset { - CLASSPATH - COPYALL + CLASSPATH + COPYALL } - restore + restore { - INCLUDE + INCLUDE } - script + script { - csh + csh { - 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC + 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pk all $ZIPSOURCE $BTARGET $MAXPROC 600: umask 002 800: rehash 850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR @@ -1502,10 +1502,10 @@ unxmacxi 900: if ( "$?SO_GEN_ERROR" == 1 ) echo $SO_GEN_ERROR 901: if ( "$?SO_GEN_ERROR2" == 1 ) echo $SO_GEN_ERROR2 } - sh + sh { 400: if [ $COPYALL ]; then - 410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC + 410: $SOLAR_ENV_ROOT/etools/lucopy.pk all $ZIPSOURCE $BTARGET $MAXPROC 415: fi 600: umask 002 800: hash -r @@ -1523,43 +1523,43 @@ unxmacxi 882: fi } } - switches + switches { bs_sourceroot SOURCE_ROOT_TMP - bsclient - ca - cap - cax + bsclient + ca + cap + cax compath STAR_COMPATH - debug - distroot - envroot - jdk13 - jdk13path - jdk14 - jdk14path - jdk15 - jdk15path + debug + distroot + envroot + jdk13 + jdk13path + jdk14 + jdk14path + jdk15 + jdk15path l10n L10N_framework nativecvs STAR_NATIVECVS pre PRE - pro - sourceroot - stl - sysbaseroot + pro + sourceroot + stl + sysbaseroot } } -unxsoli4 +unxsoli4 { - environment + environment { - bs_sourceroot + bs_sourceroot { SOLAR_SOURCE_ROOT %SOURCE_ROOT_TMP% SOURCE_ROOT %SOURCE_ROOT_TMP% SOURCE_ROOT_USED TRUE } - ca + ca { COPYALL TRUE DEVROOT %SOL_TMP%$/r @@ -1570,7 +1570,7 @@ unxsoli4 SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP% SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP% } - cap + cap { COPYALL TRUE COPY_PACKED TRUE @@ -1583,7 +1583,7 @@ unxsoli4 SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP% SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP% } - cax + cax { COPYALL FALSE DEVROOT %SOL_TMP%$/r @@ -1595,7 +1595,7 @@ unxsoli4 SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP% SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP% } - common + common { *build nice %PERL% %SOLARENV%/bin/build.pl %PROFULLSWITCH% *build_client nice %PERL% %SOLARENV%/bin/build_client.pl @@ -1616,13 +1616,13 @@ unxsoli4 ZIPDEP %PERL% %SOLARENV%/bin/zipdep.pl __cdpath %DRIVE_O%/%WORK_STAMP%/src%UPDMINOREXT% } - common0 + common0 { SOLAR_ENV_ROOT /so/env SOLAR_SOURCE_ROOT %DRIVE_O% SOLAR_SYSBASE_ROOT /so/env/solaris_2.10_intel } - common1 + common1 { COMPATH /so/env/compilers/SUNWS12_p/intel/SUNWspro DEVROOT %SOLAR_ENV_ROOT% @@ -1642,7 +1642,7 @@ unxsoli4 SO_PACK %SOLAR_ENV_ROOT%/pack/%WORK_STAMP% SRC_ROOT %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/src%UPDMINOREXT% } - common2 + common2 { BUILD_TOOLS %SOLARROOT%/bt_solaris_intel/%WORK_STAMP%/bin COM C52 @@ -1670,7 +1670,7 @@ unxsoli4 TEMP /var/tmp TMP /var/tmp } - compath + compath { COMPATH %STAR_COMPATH% } @@ -1684,7 +1684,7 @@ unxsoli4 { SOLAR_ENV_ROOT %ENV_ROOT% } - jdk13 + jdk13 { JAVA_HOME %JDK13PATH% JDKINC %JDK13PATH%/include:%JDK13PATH%/include/solaris @@ -1699,7 +1699,7 @@ unxsoli4 { SOLAR_JDK13PATH %JDK_PATH% } - jdk14 + jdk14 { JAVA_HOME %JDK14PATH% JDKINC %JDK14PATH%/include:%JDK14PATH%/include/solaris @@ -1714,7 +1714,7 @@ unxsoli4 { SOLAR_JDK14PATH %JDK_PATH% } - jdk15 + jdk15 { JAVA_HOME %JDK15PATH% JDKINC %JDK15PATH%/include:%JDK15PATH%/include/solaris @@ -1729,11 +1729,11 @@ unxsoli4 { SOLAR_JDK15PATH %JDK_PATH% } - nativecvs + nativecvs { *cvs %STAR_NATIVECVS% } - ojdk16 + ojdk16 { JAVA_HOME %OJDK16PATH% JDKINC %OJDK16PATH%/include:%OJDK16PATH%/include/solaris @@ -1748,13 +1748,13 @@ unxsoli4 { SOLAR_OJDK16PATH %JDK_PATH% } - pre + pre { ILIB %PRE%/lib:%ILIB% SOLARINC -I. -I%PRE%/inc %SOLARINC% SOLARLIB -L%PRE%/lib %SOLARLIB% } - pro + pro { PROSWITCH -DPRODUCT } @@ -1772,34 +1772,34 @@ unxsoli4 { SOLAR_STLPATH %SOLARVERSION%$/%INPATH%$/inc%UPDMINOREXT%$/stl } - sysbaseroot + sysbaseroot { SOLAR_SYSBASE_ROOT %SYSBASE_ROOT% } } - extern + extern { - DIST_ROOT - ENV_ROOT - HOME - JDK_PATH - LOCALINI - SOL_TMP - SOURCE_ROOT - STL_ROOT - SYSBASE_ROOT - USER + DIST_ROOT + ENV_ROOT + HOME + JDK_PATH + LOCALINI + SOL_TMP + SOURCE_ROOT + STL_ROOT + SYSBASE_ROOT + USER } order common0 bs_sourceroot envroot:0 sourceroot:0 common1 distroot:0 jdk13path:0 jdk14path:0 jdk15path:0 ojdk16path:0 sysbaseroot ca cap cax compath nativecvs common2 pro stl:1 stl:0 common jdk13 jdk14 jdk15 ojdk16 pre - reset + reset { - CLASSPATH + CLASSPATH } - script + script { - csh + csh { - 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC + 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pk all $ZIPSOURCE $BTARGET $MAXPROC 600: umask 002 800: rehash 850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR @@ -1807,10 +1807,10 @@ unxsoli4 900: if ( "$?SO_GEN_ERROR" == 1 ) echo $SO_GEN_ERROR 901: if ( "$?SO_GEN_ERROR2" == 1 ) echo $SO_GEN_ERROR2 } - sh + sh { 400: if [ $COPYALL ]; then - 410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC + 410: $SOLAR_ENV_ROOT/etools/lucopy.pk all $ZIPSOURCE $BTARGET $MAXPROC 415: fi 600: umask 002 800: hash -r @@ -1828,44 +1828,44 @@ unxsoli4 882: fi } } - switches + switches { bs_sourceroot SOURCE_ROOT_TMP - bsclient - ca - cap - cax + bsclient + ca + cap + cax compath STAR_COMPATH - distroot - envroot - jdk13 - jdk13path - jdk14 - jdk14path - jdk15 - jdk15path + distroot + envroot + jdk13 + jdk13path + jdk14 + jdk14path + jdk15 + jdk15path l10n L10N_framework nativecvs STAR_NATIVECVS - ojdk16 - ojdk16path + ojdk16 + ojdk16path pre PRE - pro - sourceroot - stl - sysbaseroot + pro + sourceroot + stl + sysbaseroot } } -unxsols4 +unxsols4 { - environment + environment { - bs_sourceroot + bs_sourceroot { SOLAR_SOURCE_ROOT %SOURCE_ROOT_TMP% SOURCE_ROOT %SOURCE_ROOT_TMP% SOURCE_ROOT_USED TRUE } - ca + ca { COPYALL TRUE DEVROOT %SOL_TMP%$/r @@ -1876,7 +1876,7 @@ unxsols4 SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP% SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP% } - cap + cap { COPYALL TRUE COPY_PACKED TRUE @@ -1889,7 +1889,7 @@ unxsols4 SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP% SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP% } - cax + cax { COPYALL FALSE DEVROOT %SOL_TMP%$/r @@ -1901,7 +1901,7 @@ unxsols4 SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP% SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP% } - common + common { *build nice %PERL% %SOLARENV%/bin/build.pl %PROFULLSWITCH% *build_client nice %PERL% %SOLARENV%/bin/build_client.pl @@ -1922,14 +1922,14 @@ unxsols4 ZIPDEP %PERL% %SOLARENV%/bin/zipdep.pl __cdpath %DRIVE_O%/%WORK_STAMP%/src%UPDMINOREXT% } - common0 + common0 { SOLAR_ENV_ROOT /so/env SOLAR_LICENSE_FILE /opt/SUNWspro/license_dir/sunpro.lic,1 SOLAR_SOURCE_ROOT %DRIVE_O% SOLAR_SYSBASE_ROOT /so/env/solaris_2.10_sparc } - common1 + common1 { COMPATH /so/env/compilers/SUNWS12_p/sparc/SUNWspro DEVROOT %SOLAR_ENV_ROOT% @@ -1949,7 +1949,7 @@ unxsols4 SO_PACK %SOLAR_ENV_ROOT%/pack/%WORK_STAMP% SRC_ROOT %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/src%UPDMINOREXT% } - common2 + common2 { BUILD_TOOLS %SOLARROOT%/bt_solaris_sparc/%WORK_STAMP%/bin COM C52 @@ -1983,7 +1983,7 @@ unxsols4 TEMP /tmp TMP /tmp } - compath + compath { COMPATH %STAR_COMPATH% } @@ -1997,7 +1997,7 @@ unxsols4 { SOLAR_ENV_ROOT %ENV_ROOT% } - jdk13 + jdk13 { JAVA_HOME %JDK13PATH% JDKINC %JDK13PATH%/include:%JDK13PATH%/include/solaris @@ -2012,7 +2012,7 @@ unxsols4 { SOLAR_JDK13PATH %JDK_PATH% } - jdk14 + jdk14 { JAVA_HOME %JDK14PATH% JDKINC %JDK14PATH%/include:%JDK14PATH%/include/solaris @@ -2027,7 +2027,7 @@ unxsols4 { SOLAR_JDK14PATH %JDK_PATH% } - jdk15 + jdk15 { JAVA_HOME %JDK15PATH% JDKINC %JDK15PATH%/include:%JDK15PATH%/include/solaris @@ -2042,11 +2042,11 @@ unxsols4 { SOLAR_JDK15PATH %JDK_PATH% } - nativecvs + nativecvs { *cvs %STAR_NATIVECVS% } - ojdk16 + ojdk16 { JAVA_HOME %OJDK16PATH% JDKINC %OJDK16PATH%/include:%OJDK16PATH%/include/solaris @@ -2061,13 +2061,13 @@ unxsols4 { SOLAR_OJDK16PATH %JDK_PATH% } - pre + pre { ILIB %PRE%/lib:%ILIB% SOLARINC -I. -I%PRE%/inc %SOLARINC% SOLARLIB -L%PRE%/lib %SOLARLIB% } - pro + pro { PROSWITCH -DPRODUCT } @@ -2085,35 +2085,35 @@ unxsols4 { SOLAR_STLPATH %SOLARVERSION%$/%INPATH%$/inc%UPDMINOREXT%$/stl } - sysbaseroot + sysbaseroot { SOLAR_SYSBASE_ROOT %SYSBASE_ROOT% } } - extern + extern { - DIST_ROOT - ENV_ROOT - HOME - JDK_PATH - LM_LICENSE_FILE - LOCALINI - SOL_TMP - SOURCE_ROOT - STL_ROOT - SYSBASE_ROOT - USER + DIST_ROOT + ENV_ROOT + HOME + JDK_PATH + LM_LICENSE_FILE + LOCALINI + SOL_TMP + SOURCE_ROOT + STL_ROOT + SYSBASE_ROOT + USER } order common0 bs_sourceroot envroot:0 sourceroot:0 common1 distroot:0 jdk13path:0 jdk14path:0 jdk15path:0 ojdk16path:0 sysbaseroot ca cap cax compath nativecvs common2 common:3 pro stl:1 stl:0 common jdk13 jdk14 jdk15 ojdk16 pre - reset + reset { - CLASSPATH + CLASSPATH } - script + script { - csh + csh { - 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC + 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pk all $ZIPSOURCE $BTARGET $MAXPROC 600: umask 002 800: rehash 850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR @@ -2121,10 +2121,10 @@ unxsols4 900: if ( "$?SO_GEN_ERROR" == 1 ) echo $SO_GEN_ERROR 901: if ( "$?SO_GEN_ERROR2" == 1 ) echo $SO_GEN_ERROR2 } - sh + sh { 400: if [ $COPYALL ]; then - 410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC + 410: $SOLAR_ENV_ROOT/etools/lucopy.pk all $ZIPSOURCE $BTARGET $MAXPROC 415: fi 600: umask 002 800: hash -r @@ -2142,44 +2142,44 @@ unxsols4 882: fi } } - switches + switches { bs_sourceroot SOURCE_ROOT_TMP - bsclient - ca - cap - cax + bsclient + ca + cap + cax compath STAR_COMPATH - distroot - envroot - jdk13 - jdk13path - jdk14 - jdk14path - jdk15 - jdk15path + distroot + envroot + jdk13 + jdk13path + jdk14 + jdk14path + jdk15 + jdk15path l10n L10N_framework nativecvs STAR_NATIVECVS - ojdk16 - ojdk16path + ojdk16 + ojdk16path pre PRE - pro - sourceroot - stl - sysbaseroot + pro + sourceroot + stl + sysbaseroot } } -unxsolu4 +unxsolu4 { - environment + environment { - bs_sourceroot + bs_sourceroot { SOLAR_SOURCE_ROOT %SOURCE_ROOT_TMP% SOURCE_ROOT %SOURCE_ROOT_TMP% SOURCE_ROOT_USED TRUE } - ca + ca { COPYALL TRUE DEVROOT %SOL_TMP%$/r @@ -2190,7 +2190,7 @@ unxsolu4 SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP% SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP% } - cap + cap { COPYALL TRUE COPY_PACKED TRUE @@ -2203,7 +2203,7 @@ unxsolu4 SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP% SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP% } - cax + cax { COPYALL FALSE DEVROOT %SOL_TMP%$/r @@ -2215,7 +2215,7 @@ unxsolu4 SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP% SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP% } - common + common { *build nice %PERL% %SOLARENV%/bin/build.pl %PROFULLSWITCH% *build_client nice %PERL% %SOLARENV%/bin/build_client.pl @@ -2228,7 +2228,7 @@ unxsolu4 COPYPRJ %PERL% %COMMON_ENV_TOOLS%/copyprj.pl DELIVER %PERL% %SOLARENV%/bin/deliver.pl DMAKEROOT %SOLARENV%/inc/startup - ENABLE_GNOMEVFS + ENABLE_GNOMEVFS FREETYPE_CFLAGS -I%SYSBASE%/usr/sfw/include -I%SYSBASE%/usr/sfw/include/freetype2 FREETYPE_LIBS -L%SYSBASE%/usr/sfw/lib/sparcv9 -lfreetype LIBXML_CFLAGS -I%SYSBASE%/usr/include/libxml2 @@ -2246,13 +2246,13 @@ unxsolu4 ZIPDEP %PERL% %SOLARENV%/bin/zipdep.pl __cdpath %DRIVE_O%/%WORK_STAMP%/src%UPDMINOREXT% } - common0 + common0 { SOLAR_ENV_ROOT /so/env SOLAR_SOURCE_ROOT %DRIVE_O% SOLAR_SYSBASE_ROOT /so/env/solaris_2.10_sparc } - common1 + common1 { COMPATH /so/env/compilers/SUNWS12m1/sparc/SUNWspro DEVROOT %SOLAR_ENV_ROOT% @@ -2269,7 +2269,7 @@ unxsolu4 SRC_ROOT %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/src%UPDMINOREXT% USE_SYSTEM_STL YES } - common2 + common2 { BUILD_TOOLS %SOLARROOT%/bt_solaris_sparc/%WORK_STAMP%/bin COM C52 @@ -2298,7 +2298,7 @@ unxsolu4 TEMP /tmp TMP /tmp } - compath + compath { COMPATH %STAR_COMPATH% } @@ -2312,7 +2312,7 @@ unxsolu4 { SOLAR_ENV_ROOT %ENV_ROOT% } - jdk15 + jdk15 { JAVA_HOME %JDK15PATH% JDKINC %JDK15PATH%/include:%JDK15PATH%/include/solaris @@ -2327,17 +2327,17 @@ unxsolu4 { SOLAR_JDK15PATH %JDK_PATH% } - nativecvs + nativecvs { *cvs %STAR_NATIVECVS% } - pre + pre { ILIB %PRE%/lib:%ILIB% SOLARINC -I. -I%PRE%/inc %SOLARINC% SOLARLIB -L%PRE%/lib %SOLARLIB% } - pro + pro { PROSWITCH -DPRODUCT } @@ -2355,35 +2355,35 @@ unxsolu4 { SOLAR_STLPATH %SOLARVERSION%$/%INPATH%$/inc%UPDMINOREXT%$/stl } - sysbaseroot + sysbaseroot { SOLAR_SYSBASE_ROOT %SYSBASE_ROOT% } } - extern + extern { - DIST_ROOT - ENV_ROOT - HOME - JDK_PATH - LM_LICENSE_FILE - LOCALINI - SOL_TMP - SOURCE_ROOT - STL_ROOT - SYSBASE_ROOT - USER + DIST_ROOT + ENV_ROOT + HOME + JDK_PATH + LM_LICENSE_FILE + LOCALINI + SOL_TMP + SOURCE_ROOT + STL_ROOT + SYSBASE_ROOT + USER } order common0 bs_sourceroot envroot:0 sourceroot:0 common1 distroot:0 jdk15path:0 sysbaseroot ca cap cax compath nativecvs common2 common:3 pro stl:1 stl:0 common jdk15 pre - reset + reset { - CLASSPATH + CLASSPATH } - script + script { - csh + csh { - 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET + 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pk all $ZIPSOURCE $BTARGET 600: umask 002 800: rehash 850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR @@ -2391,10 +2391,10 @@ unxsolu4 900: if ( "$?SO_GEN_ERROR" == 1 ) echo $SO_GEN_ERROR 901: if ( "$?SO_GEN_ERROR2" == 1 ) echo $SO_GEN_ERROR2 } - sh + sh { 400: if [ $COPYALL ]; then - 410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET + 410: $SOLAR_ENV_ROOT/etools/lucopy.pk all $ZIPSOURCE $BTARGET 415: fi 600: umask 002 800: hash -r @@ -2412,38 +2412,38 @@ unxsolu4 882: fi } } - switches + switches { bs_sourceroot SOURCE_ROOT_TMP - bsclient - ca - cap - cax + bsclient + ca + cap + cax compath STAR_COMPATH - distroot - envroot - jdk15 - jdk15path + distroot + envroot + jdk15 + jdk15path l10n L10N_framework nativecvs STAR_NATIVECVS pre PRE - pro - sourceroot - stl - sysbaseroot + pro + sourceroot + stl + sysbaseroot } } -unxubti8 +unxubti8 { - environment + environment { - bs_sourceroot + bs_sourceroot { SOLAR_SOURCE_ROOT %SOURCE_ROOT_TMP% SOURCE_ROOT %SOURCE_ROOT_TMP% SOURCE_ROOT_USED TRUE } - ca + ca { COPYALL TRUE DEVROOT %SOL_TMP%$/r @@ -2454,7 +2454,7 @@ unxubti8 SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP% SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP% } - cap + cap { COPYALL TRUE COPY_PACKED TRUE @@ -2467,7 +2467,7 @@ unxubti8 SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP% SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP% } - cax + cax { COPYALL FALSE DEVROOT %SOL_TMP%$/r @@ -2479,7 +2479,7 @@ unxubti8 SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP% SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP% } - common + common { *build nice %PERL% %SOLARENV%/bin/build.pl %PROFULLSWITCH% *build_client nice %PERL% %SOLARENV%/bin/build_client.pl @@ -2500,12 +2500,12 @@ unxubti8 SOLAR_JAVA TRUE ZIPDEP %PERL% %SOLARENV%/bin/zipdep.pl } - common0 + common0 { SOLAR_ENV_ROOT /so/env SOLAR_SOURCE_ROOT %DRIVE_O% } - common1 + common1 { AGG_VERSION 2300 ANT /usr/share/ant/bin/ant @@ -2546,7 +2546,7 @@ unxubti8 XINERAMA_LINK dynamic ZIPDEP zipdep.pl } - common2 + common2 { ENABLE_GRAPHITE TRUE BUILD_TOOLS %SOLARROOT%/bt_linux_libc2.11/%WORK_STAMP%/bin @@ -2569,11 +2569,11 @@ unxubti8 TEMP /tmp TMP /tmp } - compath + compath { COMPATH /usr/bin } - debug + debug { LD_LIBRARY_PATH %SOLARROOT%/solenv/unxlngi4/lib/debug:%LD_LIBRARY_PATH% } @@ -2586,7 +2586,7 @@ unxubti8 { SOLAR_ENV_ROOT %ENV_ROOT% } - jdk15 + jdk15 { JAVA_HOME %OJDK16PATH% JDKINC %OJDK16PATH%/include:%OJDK16PATH%/include/linux @@ -2600,11 +2600,11 @@ unxubti8 { SOLAR_JDK15PATH %JDK_PATH% } - nativecvs + nativecvs { *cvs %STAR_NATIVECVS% } - ojdk16 + ojdk16 { JAVA_HOME %OJDK16PATH% JDKINC %OJDK16PATH%/include:%OJDK16PATH%/include/linux @@ -2618,17 +2618,17 @@ unxubti8 { SOLAR_OJDK16PATH %JDK_PATH% } - pre + pre { LD_LIBRARY_PATH %PRE%/lib:%LD_LIBRARY_PATH% SOLARINC -I. -I%PRE%/inc %SOLARINC% SOLARLIB -L../lib -L%PRE%/lib %SOLARLIB% -L/usr/X11R6/lib } - pro + pro { PROSWITCH -DPRODUCT } - shell + shell { USE_SHELL STAR_USE_SHELL } @@ -2647,78 +2647,78 @@ unxubti8 SOLAR_STLPATH %SOLARVERSION%$/%INPATH%$/inc%UPDMINOREXT%$/stl } } - extern + extern { - DIST_ROOT - ENV_ROOT - HOME - JDK_PATH - LOCALINI - SOL_TMP - SOURCE_ROOT - STL_ROOT - USER + DIST_ROOT + ENV_ROOT + HOME + JDK_PATH + LOCALINI + SOL_TMP + SOURCE_ROOT + STL_ROOT + USER } order common0 bs_sourceroot envroot:0 sourceroot:0 common1 ojdk16path:0 distroot:0 nativecvs ca cap cax compath common2 pro stl:0 stl:1 common jdk15 ojdk16 debug pre - reset + reset { - CLASSPATH - COPYALL - ENABLE_CRASHDUMP + CLASSPATH + COPYALL + ENABLE_CRASHDUMP } - restore + restore { - INCLUDE + INCLUDE } - script + script { - csh + csh { - 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET + 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pk all $ZIPSOURCE $BTARGET 600: umask 002 800: rehash } - sh + sh { 400: if [ $COPYALL ]; then - 410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET + 410: $SOLAR_ENV_ROOT/etools/lucopy.pk all $ZIPSOURCE $BTARGET 415: fi 600: umask 002 800: hash -r 882: fi } } - switches + switches { bs_sourceroot SOURCE_ROOT_TMP - bsclient - ca - cap - cax - debug - distroot - envroot - jdk15 + bsclient + ca + cap + cax + debug + distroot + envroot + jdk15 l10n L10N_framework nativecvs STAR_NATIVECVS - ojdk16 - ojdk16path + ojdk16 + ojdk16path pre PRE - pro - sourceroot + pro + sourceroot } } -wntgcci1 +wntgcci1 { - environment + environment { - bs_sourceroot + bs_sourceroot { SOLAR_SOURCE_ROOT %SOURCE_ROOT_TMP% SOURCE_ROOT %SOURCE_ROOT_TMP% SOURCE_ROOT_USED TRUE } - ca + ca { COMPATH %SOL_TMP%$/r$/MinGW COPYALL TRUE @@ -2733,7 +2733,7 @@ wntgcci1 SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP% SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP% } - cap + cap { COMPATH %SOL_TMP%$/r$/MinGW COPYALL TRUE @@ -2750,7 +2750,7 @@ wntgcci1 SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP% SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP% } - cax + cax { COMPATH %SOL_TMP%$/r$/MinGW COPYALL FALSE @@ -2765,7 +2765,7 @@ wntgcci1 SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP% SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP% } - common + common { *build %PERL% %SOLARENV%$/bin$/build.pl %PROFULLSWITCH% *build_client %PERL% %SOLARENV%$/bin$/build_client.pl @@ -2777,7 +2777,7 @@ wntgcci1 *r cd %SOLARROOT% *s cd %SOLARVERSION% *zipdep %PERL% %SOLARENV%$/bin$/zipdep.pl - BIG_SVX + BIG_SVX COPYPRJ %PERL% %COMMON_ENV_TOOLS%/copyprj.pl DELIVER %PERL% %SOLARENV%$/bin$/deliver.pl DMAKEROOT %SOLARENV%$/inc$/startup @@ -2794,13 +2794,13 @@ wntgcci1 XCLASSPATH . ZIPDEP %PERL% %SOLARENV%$/bin$/zipdep.pl } - common0 + common0 { SOLAR_ENV_ROOT r: SOLAR_SOURCE_ROOT o: USE_SHELL bash } - common1 + common1 { COMPATH %SOLAR_ENV_ROOT%$/MinGW # FSDK %SOLAR_ENV_ROOT%$/msvc7net$/FrameworkSDK @@ -2819,7 +2819,7 @@ wntgcci1 SO_PACK %SOLAR_ENV_ROOT%$/pack$/%WORK_STAMP% SRC_ROOT %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/src%UPDMINOREXT% } - common2 + common2 { ENABLE_GRAPHITE TRUE BUILD_TOOLS %SOLARROOT%$/btw$/%WORK_STAMP% @@ -2848,7 +2848,7 @@ wntgcci1 SORT sort -T %TMP% use_shl_versions TRUE } - compath + compath { COMPATH %STAR_COMPATH% } @@ -2862,7 +2862,7 @@ wntgcci1 { SOLAR_ENV_ROOT %ENV_ROOT% } - jdk13 + jdk13 { HOMEDRIVE %DEVROOT% HOMEPATH $/jdk131 @@ -2881,7 +2881,7 @@ wntgcci1 { SOLAR_JDK13PATH %JDK_PATH% } - jdk14 + jdk14 { HOMEDRIVE %DEVROOT% HOMEPATH $/jdk141 @@ -2900,7 +2900,7 @@ wntgcci1 { SOLAR_JDK14PATH %JDK_PATH% } - jdk15 + jdk15 { HOMEDRIVE %DEVROOT% HOMEPATH $/jdk151 @@ -2919,16 +2919,16 @@ wntgcci1 { SOLAR_JDK15PATH %JDK_PATH% } - pre + pre { ILIB %PRE%$/lib$:%ILIB% LIB %PRE%$/lib$:%LIB% } - psdk + psdk { PSDK %STAR_PSDK% } - shell + shell { USE_SHELL STAR_USE_SHELL } @@ -2947,32 +2947,32 @@ wntgcci1 SOLAR_STLPATH %SOLARVERSION%$/%INPATH%$/inc%UPDMINOREXT%$/stl } } - extern + extern { - COMSPEC - DIST_ROOT - ENV_ROOT - JDK_PATH - LOCALINI - SOL_TMP - SOURCE_ROOT - STL_ROOT + COMSPEC + DIST_ROOT + ENV_ROOT + JDK_PATH + LOCALINI + SOL_TMP + SOURCE_ROOT + STL_ROOT } order common0 bs_sourceroot envroot:0 sourceroot:0 common1 distroot:0 ca cap cax psdk compath common2 jdk13path:0 jdk14path:0 jdk15path:0 stl:1 stl:0 common jdk13 jdk14 jdk15 pre - reset + reset { - COPYALL - NSIS_PATH - SOLAR_ENV_ROOT - WST + COPYALL + NSIS_PATH + SOLAR_ENV_ROOT + WST } - script + script { - csh + csh { 150: setenv MYENV_PATH $PATH 160: setenv PATH $SSX_PATH - 200: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/btw/perl/bin/perl $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC + 200: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/btw/perl/bin/perl $SOLAR_ENV_ROOT/etools/lucopy.pk all $ZIPSOURCE $BTARGET $MAXPROC 260: setenv PATH $MYENV_PATH 270: unsetenv MYENV_PATH 850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR @@ -2980,14 +2980,14 @@ wntgcci1 900: if ( "$?SO_GEN_ERROR" == 1 ) echo $SO_GEN_ERROR 901: if ( "$?SO_GEN_ERROR2" == 1 ) echo $SO_GEN_ERROR2 } - sh + sh { 150: export MYENV_PATH=$PATH 160: export PATH=$SSX_PATH 260: export PATH=$MYENV_PATH 270: unset MYENV_PATH 400: if [ $COPYALL ]; then - 410: $SOLAR_ENV_ROOT/btw/perl/bin/perl $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC + 410: $SOLAR_ENV_ROOT/btw/perl/bin/perl $SOLAR_ENV_ROOT/etools/lucopy.pk all $ZIPSOURCE $BTARGET $MAXPROC 415: fi 850: if [ "0$SO_GEN_ERROR" -eq 0 ]; then 851: export SO_GEN_ERROR @@ -3003,42 +3003,42 @@ wntgcci1 882: fi } } - switches + switches { bs_sourceroot SOURCE_ROOT_TMP - bsclient - ca - cap - cax + bsclient + ca + cap + cax compath STAR_COMPATH - distroot - envroot - jdk13 - jdk13path - jdk14 - jdk14path - jdk15 - jdk15path + distroot + envroot + jdk13 + jdk13path + jdk14 + jdk14path + jdk15 + jdk15path l10n L10N_framework pre PRE - pro + pro psdk STAR_PSDK shell STAR_USE_SHELL - sourceroot - stl + sourceroot + stl } } -wntmsci11 +wntmsci11 { - environment + environment { - bs_sourceroot + bs_sourceroot { SOLAR_SOURCE_ROOT %SOURCE_ROOT_TMP% SOURCE_ROOT %SOURCE_ROOT_TMP% SOURCE_ROOT_USED TRUE } - ca + ca { COMPATH %SOL_TMP%$/r$/msvc8p COMPROOT %SOL_TMP%$/r$/msvc8p @@ -3055,7 +3055,7 @@ wntmsci11 SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP% SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP% } - cap + cap { COMPATH %SOL_TMP%$/r$/msvc8p COMPROOT %SOL_TMP%$/r$/msvc8p @@ -3074,7 +3074,7 @@ wntmsci11 SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP% SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP% } - cax + cax { COMPATH %SOL_TMP%$/r$/msvc8p COMPROOT %SOL_TMP%$/r$/msvc8p @@ -3091,7 +3091,7 @@ wntmsci11 SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP% SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP% } - common + common { *build %PERL% %SOLARENV%$/bin$/build.pl %PROFULLSWITCH% *build_client %PERL% %SOLARENV%$/bin$/build_client.pl @@ -3103,7 +3103,7 @@ wntmsci11 *r cdd %SOLARROOT% *s cdd %SOLARVERSION% *zipdep %PERL% %SOLARENV%$/bin$/zipdep.pl - BIG_SVX + BIG_SVX BISON_PKGDATADIR %BUILD_TOOLS%$/share$/bison COPYPRJ %PERL% %COMMON_ENV_TOOLS%/copyprj.pl DELIVER %PERL% %SOLARENV%$/bin$/deliver.pl @@ -3126,14 +3126,14 @@ wntmsci11 XCLASSPATH . ZIPDEP %PERL% %SOLARENV%$/bin$/zipdep.pl } - common0 + common0 { BS_ROOT n: SOLAR_ENV_ROOT r: SOLAR_SOURCE_ROOT o: USE_SHELL 4nt } - common1 + common1 { COMPATH %SOLAR_ENV_ROOT%$/msvc8p COMPROOT %SOLAR_ENV_ROOT%$/msvc8p @@ -3152,7 +3152,7 @@ wntmsci11 SO_PACK %SOLAR_ENV_ROOT%$/pack$/%WORK_STAMP% SRC_ROOT %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/src%UPDMINOREXT% } - common2 + common2 { ENABLE_GRAPHITE TRUE BUILD_TOOLS %SOLARROOT%$/btw$/%WORK_STAMP% @@ -3184,7 +3184,7 @@ wntmsci11 SORT sort -T %TMP% use_shl_versions TRUE } - compath + compath { COMPATH %STAR_COMPATH% } @@ -3198,7 +3198,7 @@ wntmsci11 { SOLAR_ENV_ROOT %ENV_ROOT% } - jdk13 + jdk13 { HOMEDRIVE %DEVROOT% HOMEPATH $/jdk131 @@ -3217,7 +3217,7 @@ wntmsci11 { SOLAR_JDK13PATH %JDK_PATH% } - jdk14 + jdk14 { HOMEDRIVE %DEVROOT% HOMEPATH $/jdk141 @@ -3236,7 +3236,7 @@ wntmsci11 { SOLAR_JDK14PATH %JDK_PATH% } - jdk15 + jdk15 { HOMEDRIVE %DEVROOT% HOMEPATH $/jdk151 @@ -3255,16 +3255,16 @@ wntmsci11 { SOLAR_JDK15PATH %JDK_PATH% } - pre + pre { ILIB %PRE%$/lib$:%ILIB% LIB %PRE%$/lib$:%LIB% } - psdk + psdk { PSDK %STAR_PSDK% } - shell + shell { use_shell STAR_USE_SHELL } @@ -3283,73 +3283,73 @@ wntmsci11 SOLAR_STLPATH %SOLARVERSION%$/%INPATH%$/inc%UPDMINOREXT%$/stl } } - extern + extern { - COMSPEC - DIST_ROOT - ENV_ROOT - JDK_PATH - LOCALINI - SOL_TMP - SOURCE_ROOT - STL_ROOT + COMSPEC + DIST_ROOT + ENV_ROOT + JDK_PATH + LOCALINI + SOL_TMP + SOURCE_ROOT + STL_ROOT } order common0 bs_sourceroot envroot:0 sourceroot:0 common1 distroot:0 ca cap cax psdk compath common2 jdk13path:0 jdk14path:0 jdk15path:0 stl:1 stl:0 common jdk13 jdk14 jdk15 pre - reset + reset { - COPYALL - SOLAR_ENV_ROOT - WST + COPYALL + SOLAR_ENV_ROOT + WST } - script + script { - post + post { 150: set MYENV_PATH=%PATH 160: set PATH=%SSX_PATH - 200: if "%COPYALL%"=="TRUE" %SOLAR_ENV_ROOT%\btw\perl\bin\perl %SOLAR_ENV_ROOT%\etools\lucopy.pl -all %ZIPSOURCE% %BTARGET% + 200: if "%COPYALL%"=="TRUE" %SOLAR_ENV_ROOT%\btw\perl\bin\perl %SOLAR_ENV_ROOT%\etools\lucopy.pk -all %ZIPSOURCE% %BTARGET% 260: set PATH=%MYENV_PATH 270: unset MYENV_PATH 400: if "%SO_GEN_ERROR%" NE "" @echo %SO_GEN_ERROR% 401: if "%SO_GEN_ERROR2%" NE "" echo %SO_GEN_ERROR2% } } - switches + switches { bs_sourceroot SOURCE_ROOT_TMP - bsclient - ca - cap - cax + bsclient + ca + cap + cax compath STAR_COMPATH - distroot - envroot - jdk13 - jdk13path - jdk14 - jdk14path - jdk15 - jdk15path + distroot + envroot + jdk13 + jdk13path + jdk14 + jdk14path + jdk15 + jdk15path l10n L10N_framework pre PRE - pro + pro psdk STAR_PSDK shell STAR_USE_SHELL - sourceroot - stl + sourceroot + stl } } -wntmsci12 +wntmsci12 { - environment + environment { - bs_sourceroot + bs_sourceroot { SOLAR_SOURCE_ROOT $dp(%SOURCE_ROOT_TMP%) SOURCE_ROOT $dp(%SOURCE_ROOT_TMP%) SOURCE_ROOT_USED TRUE } - ca + ca { BUILD_TOOLS %SOL_TMP%$/btw$/%BTOOLDIR% COMPATH %SOL_TMP%$/r$/msvc9p @@ -3371,7 +3371,7 @@ wntmsci12 # TOUCH %SOL_TMP%$/r$/btw$/%BTOOLDIR%$/touch.exe } - cap + cap { BUILD_TOOLS %SOL_TMP%$/btw$/%BTOOLDIR% COMPATH %SOL_TMP%$/r$/msvc9p @@ -3395,7 +3395,7 @@ wntmsci12 # TOUCH %SOL_TMP%$/r$/btw$/%BTOOLDIR%$/touch.exe } - cax + cax { BUILD_TOOLS %SOL_TMP%$/btw$/%BTOOLDIR% COMPATH %SOL_TMP%$/r$/msvc9p @@ -3416,7 +3416,7 @@ wntmsci12 SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP% # TOUCH %SOL_TMP%$/r$/btw$/%BTOOLDIR%$/touch.exe } - common + common { *build %PERL% %SOLARENV%$/bin$/build.pl %PROFULLSWITCH% *build_client %PERL% %SOLARENV%$/bin$/build_client.pl @@ -3429,7 +3429,7 @@ wntmsci12 *s cd %SOLARVERSION% *zipdep %PERL% %SOLARENV%$/bin$/zipdep.pl *z_ooo %PERL% %SOLARENV%$/bin$/z_ooo.pl - BIG_SVX + BIG_SVX BISON_PKGDATADIR %BUILD_TOOLS%$/share$/bison COPYPRJ %PERL% %COMMON_ENV_TOOLS%$/copyprj.pl CXX_X64_BINARY %COMPROOT%$/bin$/x86_amd64$/cl.exe @@ -3473,7 +3473,7 @@ wntmsci12 { PERL perl } - common1 + common1 { COMPATH %SOLAR_ENV_ROOT%$/msvc9p COMPROOT %SOLAR_ENV_ROOT%$/msvc9p @@ -3496,7 +3496,7 @@ wntmsci12 # TEMP $dp(%TEMP%) # TMP $dp(%TMP%) } - common2 + common2 { ENABLE_GRAPHITE TRUE BUILD_TOOLS %SOLARROOT%$/btw$/%BTOOLDIR% @@ -3535,7 +3535,7 @@ wntmsci12 { SHIPDRIVE %BS_ROOT%$/ship$/install } - compath + compath { COMPATH $dp(%STAR_COMPATH%) } @@ -3549,7 +3549,7 @@ wntmsci12 { SOLAR_ENV_ROOT $dp(%ENV_ROOT%) } - jdk13 + jdk13 { # HOMEDRIVE %DEVROOT% # HOMEPATH $/jdk131 @@ -3568,7 +3568,7 @@ wntmsci12 { SOLAR_JDK13PATH $dp(%JDK_PATH%) } - jdk14 + jdk14 { # HOMEDRIVE %DEVROOT% # HOMEPATH $/jdk141 @@ -3587,7 +3587,7 @@ wntmsci12 { SOLAR_JDK14PATH $dp(%JDK_PATH%) } - jdk15 + jdk15 { # HOMEDRIVE %DEVROOT% # HOMEPATH $/jdk151 @@ -3606,11 +3606,11 @@ wntmsci12 { SOLAR_JDK15PATH $dp(%JDK_PATH%) } - nojava + nojava { DISABLE_JAVA TRUE } - ojdk16 + ojdk16 { # HOMEDRIVE %DEVROOT% # HOMEPATH $/openjdk-6-b08-windows-i586 @@ -3628,16 +3628,16 @@ wntmsci12 { SOLAR_OJDK16PATH $dp(%JDK_PATH%) } - pre + pre { ILIB %PRE%$/lib;%ILIB% LIB %PRE%$/lib;%LIB% } - pro + pro { RES_ENUS TRUE } - psdk + psdk { PSDK $dp(%STAR_PSDK%) } @@ -3655,50 +3655,50 @@ wntmsci12 { SOLAR_STLPATH %SOLARVERSION%$/%INPATH%$/inc%UPDMINOREXT%$/stl } - tmp + tmp { SOL_TMP $dp(%SOL_TMP_DIR%) } } - extern + extern { - COMSPEC - DIST_ROOT - ENV_ROOT - JDK_PATH - LOCALINI + COMSPEC + DIST_ROOT + ENV_ROOT + JDK_PATH + LOCALINI OSTYPE - $dp(SOL_TMP) - $dp(SOURCE_ROOT) - $dp(STL_ROOT) + $dp(SOL_TMP) + $dp(SOURCE_ROOT) + $dp(STL_ROOT) $dp(TMP) $dp(TEMP) } order nojava common0 bs_sourceroot tmp envroot:0 sourceroot:0 pro common1 distroot:0 ca cap cax common02 psdk compath common2 common:3 jdk13path:0 jdk14path:0 jdk15path:0 ojdk16path:0 stl:1 stl:0 common jdk13 jdk14 jdk15 ojdk16 pre - reset - { - COPYALL - CXX_X64_BINARY - DB2IMP - GCRINC - GCRLIB - GCRPATH - LIBMGR_X64_BINARY - LINK_X64_BINARY - NSIS_PATH - OLD_CHAOS + reset + { + COPYALL + CXX_X64_BINARY + DB2IMP + GCRINC + GCRLIB + GCRPATH + LIBMGR_X64_BINARY + LINK_X64_BINARY + NSIS_PATH + OLD_CHAOS PERLDIR - SOLAR_ENV_ROOT - TFDEF - TFDIR - WST + SOLAR_ENV_ROOT + TFDEF + TFDIR + WST } - script + script { sh { 400: if [ $COPYALL ]; then - 410: perl $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC + 410: perl $SOLAR_ENV_ROOT/etools/lucopy.pk all $ZIPSOURCE $BTARGET $MAXPROC 415: fi 600: umask 002 800: hash -r @@ -3716,32 +3716,32 @@ wntmsci12 882: fi } } - switches + switches { bs_sourceroot SOURCE_ROOT_TMP - bsclient - ca - cap - cax + bsclient + ca + cap + cax compath STAR_COMPATH - distroot - envroot - jdk13 - jdk13path - jdk14 - jdk14path - jdk15 - jdk15path + distroot + envroot + jdk13 + jdk13path + jdk14 + jdk14path + jdk15 + jdk15path l10n L10N_framework - nojava - ojdk16 - ojdk16path + nojava + ojdk16 + ojdk16path pre PRE - pro + pro psdk STAR_PSDK shell STAR_USE_SHELL - sourceroot - stl + sourceroot + stl tmp SOL_TMP_DIR } } -- cgit From 2b557516512b365b4b691f1357d53d084d23efc4 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Thu, 5 Nov 2009 17:31:47 +0100 Subject: #i106641#: no crash report info on DEV code line --- solenv/config/sdev300.ini | 2 -- 1 file changed, 2 deletions(-) (limited to 'solenv') diff --git a/solenv/config/sdev300.ini b/solenv/config/sdev300.ini index 816815b67f53..18f89c4ea247 100755 --- a/solenv/config/sdev300.ini +++ b/solenv/config/sdev300.ini @@ -68,7 +68,6 @@ common } common:3 IF %UPDATER% != YES { - ENABLE_CRASHDUMP DUMMY } crashdump { @@ -85,7 +84,6 @@ common pro:0 IF %UPDATER% == YES { DELIVER_TO_ZIP TRUE - ENABLE_CRASHDUMP STATIC product full PROEXT .pro PROFULLSWITCH product=full -- cgit From abe1d852c9fe674319dcf0284847d423850f743e Mon Sep 17 00:00:00 2001 From: sb Date: Fri, 13 Nov 2009 11:04:06 +0100 Subject: sb116: #i106845# removed obsolete IRIX port --- solenv/bin/checkdll.sh | 10 --- solenv/bin/modules/osarch.pm | 9 +-- solenv/inc/_tg_shl.mk | 80 --------------------- solenv/inc/tg_shl.mk | 8 --- solenv/inc/unx.mk | 12 ---- solenv/inc/unxirgm.mk | 163 ------------------------------------------- solenv/inc/unxirxm.mk | 162 ------------------------------------------ solenv/inc/unxirxm3.mk | 162 ------------------------------------------ 8 files changed, 3 insertions(+), 603 deletions(-) delete mode 100644 solenv/inc/unxirgm.mk delete mode 100644 solenv/inc/unxirxm.mk delete mode 100644 solenv/inc/unxirxm3.mk (limited to 'solenv') diff --git a/solenv/bin/checkdll.sh b/solenv/bin/checkdll.sh index 0400f461666e..e64b8fd2aa4c 100755 --- a/solenv/bin/checkdll.sh +++ b/solenv/bin/checkdll.sh @@ -60,16 +60,6 @@ if [ -x $checkdll ]; then *) DYLD_LIBRARY_PATH=$libpath;; esac export DYLD_LIBRARY_PATH;; - IRIX) case "${LD_LIBRARYN32_PATH+X}" in - X) LD_LIBRARYN32_PATH=$libpath:$LD_LIBRARYN32_PATH;; - *) LD_LIBRARYN32_PATH=$libpath;; - esac - export LD_LIBRARYN32_PATH;; - IRIX64) case "${LD_LIBRARYN32_PATH+X}" in - X) LD_LIBRARYN32_PATH=$libpath:$LD_LIBRARYN32_PATH;; - *) LD_LIBRARYN32_PATH=$libpath;; - esac - export LD_LIBRARYN32_PATH;; *) case "${LD_LIBRARY_PATH+X}" in X) LD_LIBRARY_PATH=$libpath:$LD_LIBRARY_PATH;; *) LD_LIBRARY_PATH=$libpath;; diff --git a/solenv/bin/modules/osarch.pm b/solenv/bin/modules/osarch.pm index 8c3a87e4ddc5..205e4c933193 100755 --- a/solenv/bin/modules/osarch.pm +++ b/solenv/bin/modules/osarch.pm @@ -27,8 +27,7 @@ chop( $m_str, $s_str ); # "SCO_SV", "scouw21", "Darwin", "macosxp", "Mac OS", "macosxp", - "SINIX-N", "sinix", - "IRIX", "irix" + "SINIX-N", "sinix" ); %osDefTable = ("SunOS", "-DSYSV -DSOLARIS", @@ -42,8 +41,7 @@ chop( $m_str, $s_str ); # "SCO_SV", "-DSYSV -DSCO -DSCO_UW21", "Darwin", "-DBSD -DMACOSX", "Mac OS", "-DBSD -DMACOSX", - "SINIX-N", "-DSYSV -DSINIX", - "IRIX", "-DSYSV -DIRIX" + "SINIX-N", "-DSYSV -DSINIX" ); %osDosTable = ("SunOS", "sol", @@ -56,8 +54,7 @@ chop( $m_str, $s_str ); "SCO_SV", "sco", "Darwin", "macx", "Mac OS", "macx", - "SINIX-N", "sni", - "IRIX", "irx" + "SINIX-N", "sni" ); %archTable = ("sun4c", "sparc", diff --git a/solenv/inc/_tg_shl.mk b/solenv/inc/_tg_shl.mk index a862ec39897f..19f6e30ad175 100644 --- a/solenv/inc/_tg_shl.mk +++ b/solenv/inc/_tg_shl.mk @@ -100,9 +100,7 @@ $(USE_SHL1VERSIONMAP) .PHONY: .ENDIF # "$(SHL1VERSIONMAP)"!="" -.IF "$(OS)"!="IRIX" SHL1VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL1VERSIONMAP) -.ENDIF $(USE_SHL1VERSIONMAP): \ $(SHL1OBJS)\ @@ -139,9 +137,7 @@ $(USE_SHL1VERSIONMAP) : #and now for the plain non-generic way... .IF "$(SHL1VERSIONMAP)"!="" USE_SHL1VERSIONMAP=$(MISC)/$(SHL1VERSIONMAP:b)_$(SHL1TARGET)$(SHL1VERSIONMAP:e) -.IF "$(OS)"!="IRIX" SHL1VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL1VERSIONMAP) -.ENDIF .IF "$(OS)"=="MACOSX" $(USE_SHL1VERSIONMAP): $(SHL1OBJS) $(SHL1LIBS) @@ -189,11 +185,7 @@ $(USE_SHL1VERSIONMAP): $(SHL1VERSIONMAP) .IF "$(UNIXVERSIONNAMES)"!="" .IF "$(OS)"!="MACOSX" .IF "$(GUI)"=="UNX" -.IF "$(OS)"=="IRIX" -SHL1SONAME=$(SONAME_SWITCH)$(SHL1TARGETN:f) -.ELSE SHL1SONAME=\"$(SONAME_SWITCH)$(SHL1TARGETN:f)\" -.ENDIF .ENDIF # "$(GUI)"!="UNX" .ENDIF # "$(OS)"!="MACOSX" .ENDIF # "$(UNIXVERSIONNAMES)"!="" @@ -654,9 +646,7 @@ $(USE_SHL2VERSIONMAP) .PHONY: .ENDIF # "$(SHL2VERSIONMAP)"!="" -.IF "$(OS)"!="IRIX" SHL2VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL2VERSIONMAP) -.ENDIF $(USE_SHL2VERSIONMAP): \ $(SHL2OBJS)\ @@ -693,9 +683,7 @@ $(USE_SHL2VERSIONMAP) : #and now for the plain non-generic way... .IF "$(SHL2VERSIONMAP)"!="" USE_SHL2VERSIONMAP=$(MISC)/$(SHL2VERSIONMAP:b)_$(SHL2TARGET)$(SHL2VERSIONMAP:e) -.IF "$(OS)"!="IRIX" SHL2VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL2VERSIONMAP) -.ENDIF .IF "$(OS)"=="MACOSX" $(USE_SHL2VERSIONMAP): $(SHL2OBJS) $(SHL2LIBS) @@ -743,11 +731,7 @@ $(USE_SHL2VERSIONMAP): $(SHL2VERSIONMAP) .IF "$(UNIXVERSIONNAMES)"!="" .IF "$(OS)"!="MACOSX" .IF "$(GUI)"=="UNX" -.IF "$(OS)"=="IRIX" -SHL2SONAME=$(SONAME_SWITCH)$(SHL2TARGETN:f) -.ELSE SHL2SONAME=\"$(SONAME_SWITCH)$(SHL2TARGETN:f)\" -.ENDIF .ENDIF # "$(GUI)"!="UNX" .ENDIF # "$(OS)"!="MACOSX" .ENDIF # "$(UNIXVERSIONNAMES)"!="" @@ -1208,9 +1192,7 @@ $(USE_SHL3VERSIONMAP) .PHONY: .ENDIF # "$(SHL3VERSIONMAP)"!="" -.IF "$(OS)"!="IRIX" SHL3VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL3VERSIONMAP) -.ENDIF $(USE_SHL3VERSIONMAP): \ $(SHL3OBJS)\ @@ -1247,9 +1229,7 @@ $(USE_SHL3VERSIONMAP) : #and now for the plain non-generic way... .IF "$(SHL3VERSIONMAP)"!="" USE_SHL3VERSIONMAP=$(MISC)/$(SHL3VERSIONMAP:b)_$(SHL3TARGET)$(SHL3VERSIONMAP:e) -.IF "$(OS)"!="IRIX" SHL3VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL3VERSIONMAP) -.ENDIF .IF "$(OS)"=="MACOSX" $(USE_SHL3VERSIONMAP): $(SHL3OBJS) $(SHL3LIBS) @@ -1297,11 +1277,7 @@ $(USE_SHL3VERSIONMAP): $(SHL3VERSIONMAP) .IF "$(UNIXVERSIONNAMES)"!="" .IF "$(OS)"!="MACOSX" .IF "$(GUI)"=="UNX" -.IF "$(OS)"=="IRIX" -SHL3SONAME=$(SONAME_SWITCH)$(SHL3TARGETN:f) -.ELSE SHL3SONAME=\"$(SONAME_SWITCH)$(SHL3TARGETN:f)\" -.ENDIF .ENDIF # "$(GUI)"!="UNX" .ENDIF # "$(OS)"!="MACOSX" .ENDIF # "$(UNIXVERSIONNAMES)"!="" @@ -1762,9 +1738,7 @@ $(USE_SHL4VERSIONMAP) .PHONY: .ENDIF # "$(SHL4VERSIONMAP)"!="" -.IF "$(OS)"!="IRIX" SHL4VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL4VERSIONMAP) -.ENDIF $(USE_SHL4VERSIONMAP): \ $(SHL4OBJS)\ @@ -1801,9 +1775,7 @@ $(USE_SHL4VERSIONMAP) : #and now for the plain non-generic way... .IF "$(SHL4VERSIONMAP)"!="" USE_SHL4VERSIONMAP=$(MISC)/$(SHL4VERSIONMAP:b)_$(SHL4TARGET)$(SHL4VERSIONMAP:e) -.IF "$(OS)"!="IRIX" SHL4VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL4VERSIONMAP) -.ENDIF .IF "$(OS)"=="MACOSX" $(USE_SHL4VERSIONMAP): $(SHL4OBJS) $(SHL4LIBS) @@ -1851,11 +1823,7 @@ $(USE_SHL4VERSIONMAP): $(SHL4VERSIONMAP) .IF "$(UNIXVERSIONNAMES)"!="" .IF "$(OS)"!="MACOSX" .IF "$(GUI)"=="UNX" -.IF "$(OS)"=="IRIX" -SHL4SONAME=$(SONAME_SWITCH)$(SHL4TARGETN:f) -.ELSE SHL4SONAME=\"$(SONAME_SWITCH)$(SHL4TARGETN:f)\" -.ENDIF .ENDIF # "$(GUI)"!="UNX" .ENDIF # "$(OS)"!="MACOSX" .ENDIF # "$(UNIXVERSIONNAMES)"!="" @@ -2316,9 +2284,7 @@ $(USE_SHL5VERSIONMAP) .PHONY: .ENDIF # "$(SHL5VERSIONMAP)"!="" -.IF "$(OS)"!="IRIX" SHL5VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL5VERSIONMAP) -.ENDIF $(USE_SHL5VERSIONMAP): \ $(SHL5OBJS)\ @@ -2355,9 +2321,7 @@ $(USE_SHL5VERSIONMAP) : #and now for the plain non-generic way... .IF "$(SHL5VERSIONMAP)"!="" USE_SHL5VERSIONMAP=$(MISC)/$(SHL5VERSIONMAP:b)_$(SHL5TARGET)$(SHL5VERSIONMAP:e) -.IF "$(OS)"!="IRIX" SHL5VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL5VERSIONMAP) -.ENDIF .IF "$(OS)"=="MACOSX" $(USE_SHL5VERSIONMAP): $(SHL5OBJS) $(SHL5LIBS) @@ -2405,11 +2369,7 @@ $(USE_SHL5VERSIONMAP): $(SHL5VERSIONMAP) .IF "$(UNIXVERSIONNAMES)"!="" .IF "$(OS)"!="MACOSX" .IF "$(GUI)"=="UNX" -.IF "$(OS)"=="IRIX" -SHL5SONAME=$(SONAME_SWITCH)$(SHL5TARGETN:f) -.ELSE SHL5SONAME=\"$(SONAME_SWITCH)$(SHL5TARGETN:f)\" -.ENDIF .ENDIF # "$(GUI)"!="UNX" .ENDIF # "$(OS)"!="MACOSX" .ENDIF # "$(UNIXVERSIONNAMES)"!="" @@ -2870,9 +2830,7 @@ $(USE_SHL6VERSIONMAP) .PHONY: .ENDIF # "$(SHL6VERSIONMAP)"!="" -.IF "$(OS)"!="IRIX" SHL6VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL6VERSIONMAP) -.ENDIF $(USE_SHL6VERSIONMAP): \ $(SHL6OBJS)\ @@ -2909,9 +2867,7 @@ $(USE_SHL6VERSIONMAP) : #and now for the plain non-generic way... .IF "$(SHL6VERSIONMAP)"!="" USE_SHL6VERSIONMAP=$(MISC)/$(SHL6VERSIONMAP:b)_$(SHL6TARGET)$(SHL6VERSIONMAP:e) -.IF "$(OS)"!="IRIX" SHL6VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL6VERSIONMAP) -.ENDIF .IF "$(OS)"=="MACOSX" $(USE_SHL6VERSIONMAP): $(SHL6OBJS) $(SHL6LIBS) @@ -2959,11 +2915,7 @@ $(USE_SHL6VERSIONMAP): $(SHL6VERSIONMAP) .IF "$(UNIXVERSIONNAMES)"!="" .IF "$(OS)"!="MACOSX" .IF "$(GUI)"=="UNX" -.IF "$(OS)"=="IRIX" -SHL6SONAME=$(SONAME_SWITCH)$(SHL6TARGETN:f) -.ELSE SHL6SONAME=\"$(SONAME_SWITCH)$(SHL6TARGETN:f)\" -.ENDIF .ENDIF # "$(GUI)"!="UNX" .ENDIF # "$(OS)"!="MACOSX" .ENDIF # "$(UNIXVERSIONNAMES)"!="" @@ -3424,9 +3376,7 @@ $(USE_SHL7VERSIONMAP) .PHONY: .ENDIF # "$(SHL7VERSIONMAP)"!="" -.IF "$(OS)"!="IRIX" SHL7VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL7VERSIONMAP) -.ENDIF $(USE_SHL7VERSIONMAP): \ $(SHL7OBJS)\ @@ -3463,9 +3413,7 @@ $(USE_SHL7VERSIONMAP) : #and now for the plain non-generic way... .IF "$(SHL7VERSIONMAP)"!="" USE_SHL7VERSIONMAP=$(MISC)/$(SHL7VERSIONMAP:b)_$(SHL7TARGET)$(SHL7VERSIONMAP:e) -.IF "$(OS)"!="IRIX" SHL7VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL7VERSIONMAP) -.ENDIF .IF "$(OS)"=="MACOSX" $(USE_SHL7VERSIONMAP): $(SHL7OBJS) $(SHL7LIBS) @@ -3513,11 +3461,7 @@ $(USE_SHL7VERSIONMAP): $(SHL7VERSIONMAP) .IF "$(UNIXVERSIONNAMES)"!="" .IF "$(OS)"!="MACOSX" .IF "$(GUI)"=="UNX" -.IF "$(OS)"=="IRIX" -SHL7SONAME=$(SONAME_SWITCH)$(SHL7TARGETN:f) -.ELSE SHL7SONAME=\"$(SONAME_SWITCH)$(SHL7TARGETN:f)\" -.ENDIF .ENDIF # "$(GUI)"!="UNX" .ENDIF # "$(OS)"!="MACOSX" .ENDIF # "$(UNIXVERSIONNAMES)"!="" @@ -3978,9 +3922,7 @@ $(USE_SHL8VERSIONMAP) .PHONY: .ENDIF # "$(SHL8VERSIONMAP)"!="" -.IF "$(OS)"!="IRIX" SHL8VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL8VERSIONMAP) -.ENDIF $(USE_SHL8VERSIONMAP): \ $(SHL8OBJS)\ @@ -4017,9 +3959,7 @@ $(USE_SHL8VERSIONMAP) : #and now for the plain non-generic way... .IF "$(SHL8VERSIONMAP)"!="" USE_SHL8VERSIONMAP=$(MISC)/$(SHL8VERSIONMAP:b)_$(SHL8TARGET)$(SHL8VERSIONMAP:e) -.IF "$(OS)"!="IRIX" SHL8VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL8VERSIONMAP) -.ENDIF .IF "$(OS)"=="MACOSX" $(USE_SHL8VERSIONMAP): $(SHL8OBJS) $(SHL8LIBS) @@ -4067,11 +4007,7 @@ $(USE_SHL8VERSIONMAP): $(SHL8VERSIONMAP) .IF "$(UNIXVERSIONNAMES)"!="" .IF "$(OS)"!="MACOSX" .IF "$(GUI)"=="UNX" -.IF "$(OS)"=="IRIX" -SHL8SONAME=$(SONAME_SWITCH)$(SHL8TARGETN:f) -.ELSE SHL8SONAME=\"$(SONAME_SWITCH)$(SHL8TARGETN:f)\" -.ENDIF .ENDIF # "$(GUI)"!="UNX" .ENDIF # "$(OS)"!="MACOSX" .ENDIF # "$(UNIXVERSIONNAMES)"!="" @@ -4532,9 +4468,7 @@ $(USE_SHL9VERSIONMAP) .PHONY: .ENDIF # "$(SHL9VERSIONMAP)"!="" -.IF "$(OS)"!="IRIX" SHL9VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL9VERSIONMAP) -.ENDIF $(USE_SHL9VERSIONMAP): \ $(SHL9OBJS)\ @@ -4571,9 +4505,7 @@ $(USE_SHL9VERSIONMAP) : #and now for the plain non-generic way... .IF "$(SHL9VERSIONMAP)"!="" USE_SHL9VERSIONMAP=$(MISC)/$(SHL9VERSIONMAP:b)_$(SHL9TARGET)$(SHL9VERSIONMAP:e) -.IF "$(OS)"!="IRIX" SHL9VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL9VERSIONMAP) -.ENDIF .IF "$(OS)"=="MACOSX" $(USE_SHL9VERSIONMAP): $(SHL9OBJS) $(SHL9LIBS) @@ -4621,11 +4553,7 @@ $(USE_SHL9VERSIONMAP): $(SHL9VERSIONMAP) .IF "$(UNIXVERSIONNAMES)"!="" .IF "$(OS)"!="MACOSX" .IF "$(GUI)"=="UNX" -.IF "$(OS)"=="IRIX" -SHL9SONAME=$(SONAME_SWITCH)$(SHL9TARGETN:f) -.ELSE SHL9SONAME=\"$(SONAME_SWITCH)$(SHL9TARGETN:f)\" -.ENDIF .ENDIF # "$(GUI)"!="UNX" .ENDIF # "$(OS)"!="MACOSX" .ENDIF # "$(UNIXVERSIONNAMES)"!="" @@ -5086,9 +5014,7 @@ $(USE_SHL10VERSIONMAP) .PHONY: .ENDIF # "$(SHL10VERSIONMAP)"!="" -.IF "$(OS)"!="IRIX" SHL10VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL10VERSIONMAP) -.ENDIF $(USE_SHL10VERSIONMAP): \ $(SHL10OBJS)\ @@ -5125,9 +5051,7 @@ $(USE_SHL10VERSIONMAP) : #and now for the plain non-generic way... .IF "$(SHL10VERSIONMAP)"!="" USE_SHL10VERSIONMAP=$(MISC)/$(SHL10VERSIONMAP:b)_$(SHL10TARGET)$(SHL10VERSIONMAP:e) -.IF "$(OS)"!="IRIX" SHL10VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL10VERSIONMAP) -.ENDIF .IF "$(OS)"=="MACOSX" $(USE_SHL10VERSIONMAP): $(SHL10OBJS) $(SHL10LIBS) @@ -5175,11 +5099,7 @@ $(USE_SHL10VERSIONMAP): $(SHL10VERSIONMAP) .IF "$(UNIXVERSIONNAMES)"!="" .IF "$(OS)"!="MACOSX" .IF "$(GUI)"=="UNX" -.IF "$(OS)"=="IRIX" -SHL10SONAME=$(SONAME_SWITCH)$(SHL10TARGETN:f) -.ELSE SHL10SONAME=\"$(SONAME_SWITCH)$(SHL10TARGETN:f)\" -.ENDIF .ENDIF # "$(GUI)"!="UNX" .ENDIF # "$(OS)"!="MACOSX" .ENDIF # "$(UNIXVERSIONNAMES)"!="" diff --git a/solenv/inc/tg_shl.mk b/solenv/inc/tg_shl.mk index 496e95926981..8cb6653f334e 100644 --- a/solenv/inc/tg_shl.mk +++ b/solenv/inc/tg_shl.mk @@ -133,9 +133,7 @@ $(USE_SHL$(TNR)VERSIONMAP) .PHONY: .ENDIF # "$(SHL$(TNR)VERSIONMAP)"!="" -.IF "$(OS)"!="IRIX" SHL$(TNR)VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL$(TNR)VERSIONMAP) -.ENDIF $(USE_SHL$(TNR)VERSIONMAP): \ $(SHL$(TNR)OBJS)\ @@ -172,9 +170,7 @@ $(USE_SHL$(TNR)VERSIONMAP) : #and now for the plain non-generic way... .IF "$(SHL$(TNR)VERSIONMAP)"!="" USE_SHL$(TNR)VERSIONMAP=$(MISC)/$(SHL$(TNR)VERSIONMAP:b)_$(SHL$(TNR)TARGET)$(SHL$(TNR)VERSIONMAP:e) -.IF "$(OS)"!="IRIX" SHL$(TNR)VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL$(TNR)VERSIONMAP) -.ENDIF .IF "$(OS)"=="MACOSX" $(USE_SHL$(TNR)VERSIONMAP): $(SHL$(TNR)OBJS) $(SHL$(TNR)LIBS) @@ -222,11 +218,7 @@ $(USE_SHL$(TNR)VERSIONMAP): $(SHL$(TNR)VERSIONMAP) .IF "$(UNIXVERSIONNAMES)"!="" .IF "$(OS)"!="MACOSX" .IF "$(GUI)"=="UNX" -.IF "$(OS)"=="IRIX" -SHL$(TNR)SONAME=$(SONAME_SWITCH)$(SHL$(TNR)TARGETN:f) -.ELSE SHL$(TNR)SONAME=\"$(SONAME_SWITCH)$(SHL$(TNR)TARGETN:f)\" -.ENDIF .ENDIF # "$(GUI)"!="UNX" .ENDIF # "$(OS)"!="MACOSX" .ENDIF # "$(UNIXVERSIONNAMES)"!="" diff --git a/solenv/inc/unx.mk b/solenv/inc/unx.mk index 718e23c01b4e..3b960431e26b 100644 --- a/solenv/inc/unx.mk +++ b/solenv/inc/unx.mk @@ -151,18 +151,6 @@ .INCLUDE : unxfbsd.mk .ENDIF -.IF "$(COM)$(OS)$(CPU)" == "C730IRIXM" -.INCLUDE : unxirxm3.mk -.ENDIF - -.IF "$(COM)$(OS)$(CPU)" == "GCCIRIXM" -.INCLUDE : unxirgm.mk -.ENDIF - -.IF "$(COM)$(OS)$(CPU)" == "C710IRIXM" -.INCLUDE : unxirxm.mk -.ENDIF - .IF "$(COM)$(OS)$(CPU)" == "GCCMACOSXP" .INCLUDE : unxmacxp.mk .ENDIF diff --git a/solenv/inc/unxirgm.mk b/solenv/inc/unxirgm.mk deleted file mode 100644 index b3abfb76d2c3..000000000000 --- a/solenv/inc/unxirgm.mk +++ /dev/null @@ -1,163 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2008 by Sun Microsystems, Inc. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# $RCSfile: unxirgm.mk,v $ -# -# $Revision: 1.15 $ -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - - -# Makefile for IRIX/mips using GNU compilers 2.95.2 for n32 ABI -ASM= -AFLAGS= - -SOLAR_JAVA=TRUE -JAVADEF=-DSOLAR_JAVA -#JAVAFLAGSDEBUG=-g - -.IF "$(debug)"=="" -JAVA_RUNTIME=-ljava -.ELSE -JAVA_RUNTIME=-ljava_g -.ENDIF - -# architecture dependent flags for the C and C++ compiler that can be changed by -# exporting the variable ARCH_FLAGS="..." in the shell, which is used to start build -ARCH_FLAGS*= - -CC= gcc -CXX= g++ -CFLAGS=-c -CDEFS+= -D_PTHREADS -DSTLPORT_VERSION=0x450 -D_USE_NAMESPACE=1 -DNEW_SOLAR -CFLAGSCC=$(ARCH_FLAGS) -CFLAGSCXX=$(ARCH_FLAGS) -PICSWITCH:=-fpic - -# Compiler flags for compiling static object in multi threaded environment with graphical user interface -CFLAGSOBJGUIMT= -# Compiler flags for compiling static object in multi threaded environment with character user interface -CFLAGSOBJCUIMT= -# Compiler flags for compiling shared object in multi threaded environment with graphical user interface -CFLAGSSLOGUIMT=$(PICSWITCH) -# Compiler flags for compiling shared object in multi threaded environment with character user interface -CFLAGSSLOCUIMT=$(PICSWITCH) -# Compiler flags for profiling -CFLAGSPROF= -# Compiler flags for debugging -CFLAGSDEBUG=-g -CFLAGSDBGUTIL= -# Compiler flags for enabling optimizations -CFLAGSOPT=-O2 -# Compiler flags for disabling optimizations -CFLAGSNOOPT=-O0 -# Compiler flags for describing the output path -CFLAGSOUTOBJ=-o - -CFLAGSWARNCC=-w -CFLAGSWALLCC=-Wall -CFLAGSWERRCC=-Werror - -# exception flags -CFLAGSEXCEPTIONS=-fexceptions -CFLAGS_NO_EXCEPTIONS=-fno-exceptions - -STATIC= -Wl,-Bstatic -DYNAMIC= -Wl,-Bdynamic - -# -# To use the map files, you need to have a gcc_specs file which contains: -# *linker: -# /path/to/bin/ld.sh -# where ld.sh is a wrapper script that does some conversion of the -# map files on the fly. -# -LINK= g++ -LINKFLAGS= -L/usr/lib32 -Wl,-no_unresolved -LINKVERSIONMAPFLAG= -Wl,-exports_file - -LINKFLAGSAPPGUI= $(THREADLIB) -LINKFLAGSAPPCUI= $(THREADLIB) -LINKFLAGSSHLGUI= $(THREADLIB) -LINKFLAGSSHLCUI= $(THREADLIB) - -LINKFLAGSAPPGUI+= -Wl,-multigot -LINKFLAGSAPPCUI+= -Wl,-multigot -LINKFLAGSSHLGUI+= -shared -LINKFLAGSSHLCUI+= -shared - -LINKFLAGSTACK= -LINKFLAGSPROF= -LINKFLAGSDEBUG= -g -LINKFLAGSOPT= - -LINKFLAGSSHLGUI += -Wl,-Bsymbolic -LINKFLAGSSHLCUI += -Wl,-Bsymbolic - -APPLINKSTATIC=-Bstatic -APPLINKSHARED=-Bsymbolic - -SONAME_SWITCH = -Wl,-soname -Wl, - -# Sequence of libraries DOES matter! -STDOBJGUI= -STDSLOGUI= -STDOBJCUI= -STDSLOCUI= -STDLIBGUIMT= $(THREADLIB) $(DYNAMIC) -lX11 -lm -lgcc -lc -STDLIBCUIMT= $(THREADLIB) $(DYNAMIC) -lgcc -lc -lm -STDSHLGUIMT= -L/usr/lib32 $(THREADLIB) $(DYNAMIC) -lX11 -lm -lgcc -lc -STDSHLCUIMT= -L/usr/lib32 $(THREADLIB) $(DYNAMIC) -lm -lgcc -lc -THREADLIB= -lpthread - -.IF "$(STLPORT_VER)" >= "500" -LIBSTLPORT=$(DYNAMIC) -lstlport -LIBSTLPORTST= -lstlport -.ELSE -LIBSTLPORT=$(DYNAMIC) -lstlport_gcc -LIBSTLPORTST= -lstlport_gcc -.ENDIF - -LIBMGR= ar -LIBFLAGS= -r - -IMPLIB= -IMPLIBFLAGS= - -MAPSYM= -MAPSYMFLAGS= - -RC= irc -RCFLAGS= -fo$@ $(RCFILES) -RCLINK= -RCLINKFLAGS= -RCSETVERSION= - -DLLPOSTFIX= im -DLLPRE= lib -DLLPOST= .so - - -LDUMP=c++filt diff --git a/solenv/inc/unxirxm.mk b/solenv/inc/unxirxm.mk deleted file mode 100644 index 80aae3d5b382..000000000000 --- a/solenv/inc/unxirxm.mk +++ /dev/null @@ -1,162 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2008 by Sun Microsystems, Inc. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# $RCSfile: unxirxm.mk,v $ -# -# $Revision: 1.10 $ -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -# mak-file for IRIX/mips -ASM= -AFLAGS= - -# architecture dependent flags for the C and C++ compiler that can be changed by -# exporting the variable ARCH_FLAGS="..." in the shell, which is used to start build -ARCH_FLAGS*= - -# -# Zu den Compilerflags: -# -# -ptused : instantisiert Templates, wenn sie benutzt werden. -# Der Schalter wurde neu eingefuegt, weil sich eine -# statische Memberfunktion nicht instantisieren liess. -# (ts&sdo/10.06.98) -# -CC= cc -KPIC -c -n32 -CXX= CC -KPIC -c -n32 -ptused -OPT:Olimit=20523 -CDEFS+=-D_PTHREADS -CDEFS+= -D_STD_NO_NAMESPACE -D_VOS_NO_NAMESPACE -D_UNO_NO_NAMESPACE -# 1009 ...nested comment is not allowed... -# 1021 ...type qualifiers are meaningless in this declaration... -# 1107 ...signed bit field of length 1... -# 1110 ...statement not reached... -# 1155 ...unrecognized #pragma... -# 1171 ...expression has no effect... -# 1183 ...comparison of unsigned integer with zero... -# 1185 ...enumerated type mixed with another type... -# 1188 ...type qualifier is meaningless on cast type... -# 1233 ...explicit type is missing ("int" assumed)... -# 1234 ...access control not specified... -# 1257 ...NULL reference is not allowed... -# 1440 ...initial value of reference to non-const must be an lvalue... -# 1516 ...pointless comparison of unsigned integer with a negative constant -# 1681 ...virtual function override intended... -# 1682 ...is only partially overridden in class... -CFLAGSCC= -Xcpluscomm -woff 1009,1021,1107,1110,1155,1171,1183,1185,1188,1233,1234,1257,1440,1516,1681,1682 $(ARCH_FLAGS) -CFLAGSCXX= -woff 1009,1021,1107,1110,1155,1171,1183,1185,1188,1233,1234,1257,1440,1516,1681,1682 $(ARCH_FLAGS) -CFLAGSOBJGUIMT= -CFLAGSOBJCUIMT= -CFLAGSSLOGUIMT= -CFLAGSSLOCUIMT= -CFLAGSPROF= -CFLAGSDEBUG= -g -CFLAGSDBGUTIL= -CFLAGSOPT= -O -CFLAGSNOOPT= -CFLAGSOUTOBJ= -o - -STATIC= -B static -DYNAMIC= -B dynamic - -# -# Zu den Linkflags: -# -# -update_registry : fuer das Linken mehrerer shared Libraries -# erforderlich. -# **FUER LOKALE STAENDE FEHLT Z.ZT. EIN GULTIGER -# MECHANISMUS** -# -LINK= CC -LINKFLAGS= -LINKFLAGSAPPGUI=-n32 -multigot -LINKFLAGSSHLGUI=-B symbolic -soname $(DLLPRE)$(SHL$(TNR)TARGET)$(DLLPOSTFIX)$(DLLPOST) $(DYNAMIC) -shared -n32 -multigot -update_registry $(SOLARLIBDIR)/so_locations -LINKFLAGSAPPCUI=-n32 -multigot -LINKFLAGSSHLCUI=-B symbolic -soname $(DLLPRE)$(SHL$(TNR)TARGET)$(DLLPOSTFIX)$(DLLPOST) $(DYNAMIC) -shared -n32 -multigot -update_registry $(SOLARLIBDIR)/so_locations -LINKFLAGSTACK= -LINKFLAGSPROF= -LINKFLAGSDEBUG= -LINKFLAGSOPT= -APPLINKSTATIC=-Bstatic -APPLINKSHARED=-Bsymbolic - -# Reihenfolge der Libraries NICHT egal! -STDOBJGUI= -STDSLOGUI= -STDOBJCUI= -STDSLOCUI= -# STDLIBGUIMT= $(THREADLIB) $(DYNAMIC) -lX11 -lc -lm -STDLIBGUIMT= $(THREADLIB) $(DYNAMIC) -lX11 -lc -lm -STDLIBCUIMT= $(THREADLIB) $(DYNAMIC) -lc -lm -# STDSHLGUIMT= -L/usr/lib32 $(THREADLIB) $(DYNAMIC) -lX11 -lc -lm -STDSHLGUIMT= -L/usr/lib32 $(THREADLIB) $(DYNAMIC) -lX11 -lc -lm -STDSHLCUIMT= -L/usr/lib32 $(THREADLIB) $(DYNAMIC) -lc -lm -THREADLIB= -lpthread - -LIBMGR= ar -LIBFLAGS= -r -# LIBEXT= .so - -IMPLIB= -IMPLIBFLAGS= - -MAPSYM= -MAPSYMFLAGS= - -RC= irc -RCFLAGS= -fo$@ $(RCFILES) -RCLINK= -RCLINKFLAGS= -RCSETVERSION= - -DLLPOSTFIX= im -.IF "$(WORK_STAMP)"=="MIX364" -DLLPOSTFIX= -.ENDIF -DLLPRE= lib -DLLPOST= .so - - -LDUMP= - - -# -------------------------- -# AUS DEM ALTEN ENVIRONMENT: -# -------------------------- -# -# Linken einer statischen Library: -# ar -r ... -# -# Linken einer shared Library: -# CC -B symbolic -soname <...> -B dynamic -shared -n32 -multigot -# -update_registry <...> ... -# -# Linken einer Applikation mit statischen Librarys: -# CC -B static ... -# -# Linken einer Applikation mit stared Librarys: -# CC -n32 -multigot ... -# - diff --git a/solenv/inc/unxirxm3.mk b/solenv/inc/unxirxm3.mk deleted file mode 100644 index 8d24d2c54032..000000000000 --- a/solenv/inc/unxirxm3.mk +++ /dev/null @@ -1,162 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2008 by Sun Microsystems, Inc. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# $RCSfile: unxirxm3.mk,v $ -# -# $Revision: 1.12 $ -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - - -# Makefile for IRIX/mips -ASM= -AFLAGS= - -SOLAR_JAVA*=TRUE -JAVADEF=-DSOLAR_JAVA -#JAVAFLAGSDEBUG=-g - -.IF "$(debug)"=="" -JAVA_RUNTIME=-ljava -.ELSE -JAVA_RUNTIME=-ljava_g -.ENDIF - -# architecture dependent flags for the C and C++ compiler that can be changed by -# exporting the variable ARCH_FLAGS="..." in the shell, which is used to start build -ARCH_FLAGS*= - -CC= cc -CXX= CC -CFLAGS= -c -CDEFS+= -DSTLPORT_VERSION=0x450 -D_USE_NAMESPACE=1 -DNEW_SOLAR -CFLAGSCC=$(ARCH_FLAGS) -CFLAGSCXX= -LANG:ansi-for-init-scope=OFF -LANG:std=ON -LANG:libc_in_namespace_std=ON $(ARCH_FLAGS) - -# Compiler flags for compiling static object in multi threaded environment with graphical user interface -CFLAGSOBJGUIMT= -# Compiler flags for compiling static object in multi threaded environment with character user interface -CFLAGSOBJCUIMT= -# Compiler flags for compiling shared object in multi threaded environment with graphical user interface -CFLAGSSLOGUIMT=-KPIC -# Compiler flags for compiling shared object in multi threaded environment with character user interface -CFLAGSSLOCUIMT=-KPIC -# Compiler flags for profiling -CFLAGSPROF= -# Compiler flags for debugging -CFLAGSDEBUG=-g -CFLAGSDBGUTIL= -# Compiler flags for enabling optimizations -CFLAGSOPT=-O2 -# Compiler flags for disabling optimizations -CFLAGSNOOPT=-O0 -# Compiler flags for describing the output path -CFLAGSOUTOBJ=-o - -CFLAGSWARNCC=-w -CFLAGSWALLCC=-fullwarn -CFLAGSWERRCC= - -# exception flags -CFLAGSEXCEPTIONS=-LANG:exceptions=ON -CFLAGS_NO_EXCEPTIONS=-LANG:exceptions=OFF -#CFLAGS_NO_EXCEPTIONS= - -STATIC= -Wl,-Bstatic -DYNAMIC= -Wl,-Bdynamic - -# -# To use the map files, you need to have a gcc_specs file which contains: -# *linker: -# /path/to/bin/ld.sh -# where ld.sh is a wrapper script that does some conversion of the -# map files on the fly. -# -LINK= CC -LINKFLAGS= -L/usr/lib32 -Wl,-no_unresolved -LINKVERSIONMAPFLAG= -Wl,-exports_file - -LINKFLAGSAPPGUI= $(THREADLIB) -LINKFLAGSAPPCUI= $(THREADLIB) -LINKFLAGSSHLGUI= $(THREADLIB) -LINKFLAGSSHLCUI= $(THREADLIB) - -LINKFLAGSAPPGUI+= -Wl,-multigot -LINKFLAGSAPPCUI+= -Wl,-multigot -LINKFLAGSSHLGUI+= -shared -LINKFLAGSSHLCUI+= -shared - -LINKFLAGSTACK= -LINKFLAGSPROF= -LINKFLAGSDEBUG= -g -LINKFLAGSOPT= - -LINKFLAGSSHLGUI += -Wl,-Bsymbolic -LINKFLAGSSHLCUI += -Wl,-Bsymbolic - -APPLINKSTATIC=-Bstatic -APPLINKSHARED=-Bsymbolic - -SONAME_SWITCH = -Wl,-soname -Wl, - -# Sequence of libraries DOES matter! -STDOBJGUI= -STDSLOGUI= -STDOBJCUI= -STDSLOCUI= -STDLIBGUIMT= $(THREADLIB) $(DYNAMIC) -lX11 -lm -lc -STDLIBCUIMT= $(THREADLIB) $(DYNAMIC) -lc -lm -STDSHLGUIMT= -L/usr/lib32 $(THREADLIB) $(DYNAMIC) -lX11 -lm -lc -STDSHLCUIMT= -L/usr/lib32 $(THREADLIB) $(DYNAMIC) -lm -lc -THREADLIB= -lpthread - -#LIBSTLPORT=$(DYNAMIC) -lstlport_mipspro -LIBSTLPORT=$(DYNAMIC) -LIBSTLPORTST= -#LIBSTLPORTST= -lstlport_mipspro - -LIBMGR= ar -LIBFLAGS= -r - -IMPLIB= -IMPLIBFLAGS= - -MAPSYM= -MAPSYMFLAGS= - -RC= irc -RCFLAGS= -fo$@ $(RCFILES) -RCLINK= -RCLINKFLAGS= -RCSETVERSION= - -DLLPOSTFIX= im -DLLPRE= lib -DLLPOST= .so - - -LDUMP=c++filt - - -- cgit From 43ca3e5df9b51b69245412a2b05ed96170ad2e33 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Mon, 23 Nov 2009 19:28:17 +0100 Subject: wrong conflict resolution in m63 merge corrected --- solenv/inc/rules.mk | 394 ++++++++++++++++++++++++++-------------------------- 1 file changed, 197 insertions(+), 197 deletions(-) (limited to 'solenv') diff --git a/solenv/inc/rules.mk b/solenv/inc/rules.mk index c3414b8d0ee2..b49efd2f2e12 100644 --- a/solenv/inc/rules.mk +++ b/solenv/inc/rules.mk @@ -59,21 +59,21 @@ $(OBJ)/%.obj : %.cpp @echo Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$< .IF "$(GUI)"=="UNX" @$(RM) $@ $(@:s/.obj/.o/) - $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $(CFLAGSINCXX)$(PWD)/$*.cpp -.IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"=="" - $(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/) -.ENDIF # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"=="" - $(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI) + $(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $(CFLAGSINCXX)$(PWD)/$*.cpp +.IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"=="" + $(COMMAND_ECHO)$(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/) +.ENDIF # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"=="" + @$(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI) .ELSE @@-$(RM) $@ .IF "$(COM)"=="GCC" - $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)/$*.obj $(CFLAGSINCXX)$(PWD)/$*.cpp + $(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)/$*.obj $(CFLAGSINCXX)$(PWD)/$*.cpp .ELSE - $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)/$*.obj $(CFLAGSINCXX)$(PWD)/$*.cpp + $(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)/$*.obj $(CFLAGSINCXX)$(PWD)/$*.cpp .ENDIF .ENDIF .IF "$(nodep)"=="" - $(MAKEDEPEND) @$(mktmp -f - -p$(OBJ) $(MKDEPFLAGS) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $< ) > $(MISC)/o_$(@:f:s/.obj/.dpcc/) + $(COMMAND_ECHO)$(MAKEDEPEND) @$(mktmp -f - -p$(OBJ) $(MKDEPFLAGS) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $< ) > $(MISC)/o_$(@:f:s/.obj/.dpcc/) @noop $(assign DEPS_MADE+:=o_$(@:f:s/.obj/.dpcc/)) .ENDIF # "$(nodep)"=="" @@ -81,17 +81,17 @@ $(OBJ)/%.obj : %.cc @echo Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$< .IF "$(GUI)"=="UNX" @$(RM) $@ $(@:s/.obj/.o/) - $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $(CFLAGSINCXX)$(PWD)/$*.cc -.IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"=="" - $(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/) -.ENDIF # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"=="" - +$(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI) + $(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $(CFLAGSINCXX)$(PWD)/$*.cc +.IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"=="" + $(COMMAND_ECHO)$(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/) +.ENDIF # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"=="" + @+$(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI) .ELSE @@$(RM) $@ .IF "$(COM)"=="GCC" - $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)/$*.obj $(CFLAGSINCXX)$(PWD)/$*.cc + $(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)/$*.obj $(CFLAGSINCXX)$(PWD)/$*.cc .ELSE - $(CXX) @$(mktmp $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)/$*.obj $(CFLAGSINCXX)$(PWD)/$*.cc ) + $(COMMAND_ECHO)$(CXX) @$(mktmp $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)/$*.obj $(CFLAGSINCXX)$(PWD)/$*.cc ) .ENDIF .ENDIF @@ -110,22 +110,22 @@ $(SLO)/precompiled.% .PHONY: .IF "$(NETWORK_BUILD)"!="" -$(MKDIRHIER) $(PCHOUTDIR) .IF "$(HAVE_BIG_TMP)"=="" - -$(COPY) $(SLO)/pch/precompiled_$(PRJNAME).hxx$(PCHPOST) $(PCHOUTDIR)/precompiled_$(PRJNAME).hxx$(PCHPOST) + $(COMMAND_ECHO)-$(COPY) $(SLO)/pch/precompiled_$(PRJNAME).hxx$(PCHPOST) $(PCHOUTDIR)/precompiled_$(PRJNAME).hxx$(PCHPOST) .ENDIF # "$(HAVE_BIG_TMP)"=="" .ENDIF # "$(NETWORK_BUILD)"!="" - $(CXX) @$(mktmp -Fp$(PCHOUTDIR)/precompiled_$(PRJNAME).hxx$(PCHPOST) $(CFLAGS_CREATE_PCH) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGS_NO_EXCEPTIONS) -DEXCEPTIONS_OFF $(CFLAGSAPPEND) $(INCPCH)/precompiled_$(PRJNAME).cxx) + $(COMMAND_ECHO)$(CXX) @$(mktmp -Fp$(PCHOUTDIR)/precompiled_$(PRJNAME).hxx$(PCHPOST) $(CFLAGS_CREATE_PCH) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGS_NO_EXCEPTIONS) -DEXCEPTIONS_OFF $(CFLAGSAPPEND) $(INCPCH)/precompiled_$(PRJNAME).cxx) .IF "$(NETWORK_BUILD)"!="" - $(COPY) $(PCHOUTDIR)/precompiled_$(PRJNAME).hxx$(PCHPOST) $(SLO)/pch/precompiled_$(PRJNAME).hxx$(PCHPOST) + $(COMMAND_ECHO)$(COPY) $(PCHOUTDIR)/precompiled_$(PRJNAME).hxx$(PCHPOST) $(SLO)/pch/precompiled_$(PRJNAME).hxx$(PCHPOST) .IF "$(HAVE_BIG_TMP)"=="" - $(RM) $(PCHOUTDIR)/precompiled_$(PRJNAME).hxx$(PCHPOST) - $(RMDIR) $(PCHOUTDIR) + $(COMMAND_ECHO)$(RM) $(PCHOUTDIR)/precompiled_$(PRJNAME).hxx$(PCHPOST) + $(COMMAND_ECHO)$(RMDIR) $(PCHOUTDIR) .ENDIF # "$(HAVE_BIG_TMP)"=="" .ENDIF # "$(NETWORK_BUILD)"!="" .ELIF "$(COM)"=="GCC" && "$(CCNUMVER)">="000300040000" - $(CXX) -o$(SLO)/pch/precompiled_$(PRJNAME).hxx$(PCHPOST) $(CFLAGS_CREATE_PCH) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGS_NO_EXCEPTIONS) -DEXCEPTIONS_OFF $(CFLAGSAPPEND) $(INCPCH)/precompiled_$(PRJNAME).hxx + $(COMMAND_ECHO)$(CXX) -o$(SLO)/pch/precompiled_$(PRJNAME).hxx$(PCHPOST) $(CFLAGS_CREATE_PCH) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGS_NO_EXCEPTIONS) -DEXCEPTIONS_OFF $(CFLAGSAPPEND) $(INCPCH)/precompiled_$(PRJNAME).hxx @echo "#error Tried to use wrong precompiled header" > $(SLO)/pch/precompiled_$(PRJNAME).hxx .ELSE # "$(COM)"=="MSC" - $(TOUCH) $(SLO)/pch/precompiled_$(PRJNAME).hxx$(PCHPOST) + @$(TOUCH) $(SLO)/pch/precompiled_$(PRJNAME).hxx$(PCHPOST) .ENDIF # "$(COM)"=="MSC" @echo USED_PCHFLAGS=$(CFLAGS)$(CFLAGSCXX)$(CFLAGSCXXSLO)$(CFLAGSSLO)$(CDEFS)$(CDEFSSLO)$(CDEFSMT)$(CFLAGS_NO_EXCEPTIONS) -DEXCEPTIONS_OFF$(CFLAGSAPPEND)> $(INCCOM)/pch.mk @@ -135,22 +135,22 @@ $(SLO)/precompiled_ex.% .PHONY: .IF "$(NETWORK_BUILD)"!="" -$(MKDIRHIER) $(PCHEXOUTDIR) .IF "$(HAVE_BIG_TMP)"=="" - -$(COPY) $(SLO)/pch_ex/precompiled_$(PRJNAME).hxx$(PCHPOST) $(PCHEXOUTDIR)/precompiled_$(PRJNAME).hxx$(PCHPOST) + $(COMMAND_ECHO)-$(COPY) $(SLO)/pch_ex/precompiled_$(PRJNAME).hxx$(PCHPOST) $(PCHEXOUTDIR)/precompiled_$(PRJNAME).hxx$(PCHPOST) .ENDIF # "$(HAVE_BIG_TMP)"=="" .ENDIF # "$(NETWORK_BUILD)"!="" - $(CXX) @$(mktmp -Fp$(PCHEXOUTDIR)/precompiled_$(PRJNAME).hxx$(PCHPOST) $(CFLAGS_CREATE_PCH:s/pchname/pchname_ex/) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSEXCEPTIONS) -DEXCEPTIONS_ON $(CFLAGSAPPEND) $(INCPCH)/precompiled_$(PRJNAME).cxx) + $(COMMAND_ECHO)$(CXX) @$(mktmp -Fp$(PCHEXOUTDIR)/precompiled_$(PRJNAME).hxx$(PCHPOST) $(CFLAGS_CREATE_PCH:s/pchname/pchname_ex/) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSEXCEPTIONS) -DEXCEPTIONS_ON $(CFLAGSAPPEND) $(INCPCH)/precompiled_$(PRJNAME).cxx) .IF "$(NETWORK_BUILD)"!="" - $(COPY) $(PCHEXOUTDIR)/precompiled_$(PRJNAME).hxx$(PCHPOST) $(SLO)/pch_ex/precompiled_$(PRJNAME).hxx$(PCHPOST) + $(COMMAND_ECHO)$(COPY) $(PCHEXOUTDIR)/precompiled_$(PRJNAME).hxx$(PCHPOST) $(SLO)/pch_ex/precompiled_$(PRJNAME).hxx$(PCHPOST) .IF "$(HAVE_BIG_TMP)"=="" - $(RM) $(PCHEXOUTDIR)/precompiled_$(PRJNAME).hxx$(PCHPOST) - $(RMDIR) $(PCHEXOUTDIR) + $(COMMAND_ECHO)$(RM) $(PCHEXOUTDIR)/precompiled_$(PRJNAME).hxx$(PCHPOST) + $(COMMAND_ECHO)$(RMDIR) $(PCHEXOUTDIR) .ENDIF # "$(HAVE_BIG_TMP)"=="" .ENDIF # "$(NETWORK_BUILD)"!="" .ELIF "$(COM)"=="GCC" && "$(CCNUMVER)">="000300040000" - $(CXX) -o$(SLO)/pch_ex/precompiled_$(PRJNAME).hxx$(PCHPOST) $(CFLAGS_CREATE_PCH) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSEXCEPTIONS) -DEXCEPTIONS_ON $(CFLAGSAPPEND) $(INCPCH)/precompiled_$(PRJNAME).hxx + $(COMMAND_ECHO)$(CXX) -o$(SLO)/pch_ex/precompiled_$(PRJNAME).hxx$(PCHPOST) $(CFLAGS_CREATE_PCH) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSEXCEPTIONS) -DEXCEPTIONS_ON $(CFLAGSAPPEND) $(INCPCH)/precompiled_$(PRJNAME).hxx @echo "#error Tried to use wrong precompiled header" > $(SLO)/pch_ex/precompiled_$(PRJNAME).hxx .ELSE # "$(COM)"=="MSC" - $(TOUCH) $(SLO)/pch_ex/precompiled_$(PRJNAME).hxx$(PCHPOST) + @$(TOUCH) $(SLO)/pch_ex/precompiled_$(PRJNAME).hxx$(PCHPOST) .ENDIF # "$(COM)"=="MSC" @echo USED_EXCEPTIONS_PCHFLAGS=$(subst,$(CFLAGSDEBUG), $(CFLAGS))$(CFLAGSCXX)$(CFLAGSCXXSLO)$(CFLAGSSLO)$(CDEFS)$(CDEFSSLO)$(CDEFSMT)$(CFLAGSEXCEPTIONS) -DEXCEPTIONS_ON$(CFLAGSAPPEND)> $(INCCOM)/pch_ex.mk @@ -160,8 +160,8 @@ $(SLO)/precompiled_ex.% .PHONY: $(SLO)/%.obj : %.cxx @echo Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$< -.IF "$(ENABLE_PCH)"!="" # && ( "$(PRJNAME)"!="sw" || "$(BUILD_SPECIAL)"!="TRUE" ) -# just a helper var +.IF "$(ENABLE_PCH)"!="" && ( "$(BUILD_SPECIAL)"!="TRUE" ) +# just a helper var @noop $(assign used_exc_switches=$(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS))) # cleanup first @noop $(assign ACT_PCH_SWITCHES:=$(NULL)) @@ -174,229 +174,229 @@ $(SLO)/%.obj : %.cxx .ENDIF # "$(ENABLE_PCH)"!="" .IF "$(GUI)"=="UNX" .IF "$(TEST)"!="" - $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) -E $(CFLAGSINCXX)$(PWD)/$*.cxx + $(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) -E $(CFLAGSINCXX)$(PWD)/$*.cxx .ELSE @$(RM) $@ $(@:s/.obj/.o/) - $(CAPTURE_COMMAND) $(CXX) $(ACT_PCH_SWITCHES) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)/$*.o $(CFLAGSINCXX)$(PWD)/$*.cxx $(CAPTURE_OUTPUT) + $(COMMAND_ECHO)$(CAPTURE_COMMAND) $(CXX) $(ACT_PCH_SWITCHES) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)/$*.o $(CFLAGSINCXX)$(PWD)/$*.cxx $(CAPTURE_OUTPUT) .IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"=="" && "$(CAPTURE_COMMAND)"=="" - $(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/) -.ENDIF # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"=="" - $(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI) + $(COMMAND_ECHO)$(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/) +.ENDIF # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"=="" + @$(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI) .ENDIF .ELSE # "$(GUI)"=="UNX" @@-$(RM) $@ .IF "$(COM)"=="GCC" - $(CAPTURE_COMMAND) $(CXX) $(ACT_PCH_SWITCHES) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)/$*.obj $(CFLAGSINCXX)$(PWD)/$*.cxx $(CAPTURE_OUTPUT) + $(COMMAND_ECHO)$(CAPTURE_COMMAND) $(CXX) $(ACT_PCH_SWITCHES) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)/$*.obj $(CFLAGSINCXX)$(PWD)/$*.cxx $(CAPTURE_OUTPUT) .ELSE - $(CAPTURE_COMMAND) $(CXX) $(ACT_PCH_SWITCHES) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)/$*.obj $(CFLAGSINCXX)$(PWD)/$*.cxx $(CAPTURE_OUTPUT) -.ENDIF # "$(COM)"=="GCC" + $(COMMAND_ECHO)$(CAPTURE_COMMAND) $(CXX) $(ACT_PCH_SWITCHES) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)/$*.obj $(CFLAGSINCXX)$(PWD)/$*.cxx $(CAPTURE_OUTPUT) +.ENDIF # "$(COM)"=="GCC" .ENDIF # "$(GUI)"=="UNX" .IF "$(nodep)"=="" # fixme: write to file - $(MAKEDEPEND) @$(mktmp -f - -p$(SLO) $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $< ) > $(MISC)/s_$(@:f:s/.obj/.dpcc/) + $(COMMAND_ECHO)$(MAKEDEPEND) @$(mktmp -f - -p$(SLO) $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $< ) > $(MISC)/s_$(@:f:s/.obj/.dpcc/) @noop $(assign DEPS_MADE+:=s_$(@:f:s/.obj/.dpcc/)) .ENDIF # "$(nodep)"=="" $(SLO)/%.obj : %.cpp - @echo Making: $@ + @echo Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$< .IF "$(GUI)"=="UNX" .IF "$(TEST)"!="" - $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) -E $(CFLAGSINCXX)$(PWD)/$*.cpp + $(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) -E $(CFLAGSINCXX)$(PWD)/$*.cpp .ELSE @$(RM) $@ $(@:s/.obj/.o/) - $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)/$*.o $(CFLAGSINCXX)$(PWD)/$*.cpp + $(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)/$*.o $(CFLAGSINCXX)$(PWD)/$*.cpp .IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"=="" - $(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/) + $(COMMAND_ECHO)$(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/) .ENDIF # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"=="" - $(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI) + @$(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI) .ENDIF .ELSE @@-$(RM) $@ .IF "$(COM)"=="GCC" - $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)/$*.obj $(CFLAGSINCXX)$(PWD)/$*.cpp + $(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)/$*.obj $(CFLAGSINCXX)$(PWD)/$*.cpp .ELSE - $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)/$*.obj $(CFLAGSINCXX)$(PWD)/$*.cpp + $(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)/$*.obj $(CFLAGSINCXX)$(PWD)/$*.cpp .ENDIF .ENDIF .IF "$(nodep)"=="" - $(MAKEDEPEND) @$(mktmp -f - -p$(SLO) $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $< ) > $(MISC)/s_$(@:f:s/.obj/.dpcc/) + $(COMMAND_ECHO)$(MAKEDEPEND) @$(mktmp -f - -p$(SLO) $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $< ) > $(MISC)/s_$(@:f:s/.obj/.dpcc/) @noop $(assign DEPS_MADE+:=s_$(@:f:s/.obj/.dpcc/)) .ENDIF # "$(nodep)"=="" $(SLO)/%.obj : $(MISC)/%.cxx - @echo Making: $@ + @echo Compiling: $(PRJNAME)/$(OUTPATH)/misc/$(<:f) .IF "$(GUI)"=="UNX" .IF "$(TEST)"!="" - $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) -E $(CFLAGSINCXX)$(MISC)/$*.cxx + $(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) -E $(CFLAGSINCXX)$(MISC)/$*.cxx .ELSE @$(RM) $@ $(@:s/.obj/.o/) - $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)/$*.o $(CFLAGSINCXX)$(MISC)/$*.cxx + $(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)/$*.o $(CFLAGSINCXX)$(MISC)/$*.cxx .IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"=="" - $(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/) + $(COMMAND_ECHO)$(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/) .ENDIF # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"=="" - $(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI) + @$(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI) .ENDIF .ELSE .IF "$(COM)"=="GCC" - $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)/$*.obj $(CFLAGSINCXX)$(MISC)/$*.cxx + $(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)/$*.obj $(CFLAGSINCXX)$(MISC)/$*.cxx .ELSE - $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)/$*.obj $(CFLAGSINCXX)$(MISC)/$*.cxx + $(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)/$*.obj $(CFLAGSINCXX)$(MISC)/$*.cxx .ENDIF .ENDIF .IF "$(nodep)"=="" - $(MAKEDEPEND) @$(mktmp -f - -p$(SLO) $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $@ ) > $(MISC)/s_$(@:f:s/.obj/.dpcc/) + $(COMMAND_ECHO)$(MAKEDEPEND) @$(mktmp -f - -p$(SLO) $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $@ ) > $(MISC)/s_$(@:f:s/.obj/.dpcc/) @noop $(assign DEPS_MADE+:=s_$(@:f:s/.obj/.dpcc/)) .ENDIF # "$(nodep)"=="" $(SLO)/%.obj : $(MISC)/%.cc - @echo Making: $@ + @echo Compiling: $(PRJNAME)/$(OUTPATH)/misc/$(<:f) .IF "$(GUI)"=="UNX" .IF "$(TEST)"!="" - $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) -E $(CFLAGSINCXX)$(MISC)/$*.cc + $(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) -E $(CFLAGSINCXX)$(MISC)/$*.cc .ELSE @$(RM) $@ $(@:s/.obj/.o/) - $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)/$*.o $(CFLAGSINCXX)$(MISC)/$*.cc + $(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)/$*.o $(CFLAGSINCXX)$(MISC)/$*.cc .IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"=="" - $(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/) + $(COMMAND_ECHO)$(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/) .ENDIF # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"=="" - +$(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI) + @+$(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI) .ENDIF .ELSE - $(CXX) @$(mktmp $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)/$*.obj $(CFLAGSINCXX)$(MISC)/$*.cc ) + $(COMMAND_ECHO)$(CXX) @$(mktmp $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)/$*.obj $(CFLAGSINCXX)$(MISC)/$*.cc ) .ENDIF $(OBJ)/%.obj : $(MISC)/%.cxx - @echo Making: $@ + @echo Compiling: $(PRJNAME)/$(OUTPATH)/misc/$(<:f) .IF "$(GUI)"=="UNX" .IF "$(TEST)"!="" - $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) -E $(CFLAGSINCXX)$(MISC)/$*.cxx + $(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) -E $(CFLAGSINCXX)$(MISC)/$*.cxx .ELSE @$(RM) $@ $(@:s/.obj/.o/) - $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $(CFLAGSINCXX)$(MISC)/$*.cxx + $(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $(CFLAGSINCXX)$(MISC)/$*.cxx .IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"=="" - $(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/) + $(COMMAND_ECHO)$(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/) .ENDIF # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"=="" - $(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI) + @$(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI) .ENDIF .ELSE .IF "$(COM)"=="GCC" - $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)/$*.obj $(CFLAGSINCXX)$(MISC)/$*.cxx + $(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)/$*.obj $(CFLAGSINCXX)$(MISC)/$*.cxx .ELSE - $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)/$*.obj $(CFLAGSINCXX)$(MISC)/$*.cxx + $(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)/$*.obj $(CFLAGSINCXX)$(MISC)/$*.cxx .ENDIF .ENDIF .IF "$(nodep)"=="" - $(MAKEDEPEND) @$(mktmp -f - -p$(OBJ) $(MKDEPFLAGS) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $< ) > $(MISC)/o_$(@:f:s/.obj/.dpcc/) + $(COMMAND_ECHO)$(MAKEDEPEND) @$(mktmp -f - -p$(OBJ) $(MKDEPFLAGS) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $< ) > $(MISC)/o_$(@:f:s/.obj/.dpcc/) @noop $(assign DEPS_MADE+:=o_$(@:f:s/.obj/.dpcc/)) .ENDIF # "$(nodep)"=="" $(OBJ)/%.obj : %.c - @echo Making: $@ + @echo Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$< .IF "$(GUI)"=="UNX" .IF "$(TEST)"!="" - $(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) -E $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $*.c + $(COMMAND_ECHO)$(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) -E $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $*.c .ELSE @$(RM) $@ $(@:s/.obj/.o/) - $(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $*.c + $(COMMAND_ECHO)$(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $*.c .IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"=="" .IF "$(noadjust)"=="" - $(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/) + $(COMMAND_ECHO)$(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/) .ENDIF # "$(noadjust)"=="" .ENDIF # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"=="" - $(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI) + @$(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI) .ENDIF .ELSE .IF "$(COM)"=="GCC" - $(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)/$*.obj $*.c + $(COMMAND_ECHO)$(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)/$*.obj $*.c .ELSE .IF "$(VERBOSE)" == "TRUE" -@echo Cflags: $(CFLAGS) $(INCLUDE) .ENDIF - $(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)/$*.obj $*.c + $(COMMAND_ECHO)$(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)/$*.obj $*.c .ENDIF .ENDIF .IF "$(nodep)"=="" - $(MAKEDEPEND) @$(mktmp -f - -p$(OBJ) $(MKDEPFLAGS) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $< ) > $(MISC)/o_$(@:f:s/.obj/.dpcc/) + $(COMMAND_ECHO)$(MAKEDEPEND) @$(mktmp -f - -p$(OBJ) $(MKDEPFLAGS) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $< ) > $(MISC)/o_$(@:f:s/.obj/.dpcc/) @noop $(assign DEPS_MADE+:=o_$(@:f:s/.obj/.dpcc/)) .ENDIF # "$(nodep)"=="" $(OBJ)/%.obj : $(MISC)/%.c - @echo Making: $@ + @echo Compiling: $(PRJNAME)/$(OUTPATH)/misc/$(<:f) .IF "$(GUI)"=="UNX" @$(RM) $@ $(@:s/.obj/.o/) - $(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $(MISC)/$*.c + $(COMMAND_ECHO)$(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $(MISC)/$*.c .IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"=="" - $(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/) + $(COMMAND_ECHO)$(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/) .ENDIF # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"=="" - $(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI) + @$(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI) .ELSE @@-$(RM) $@ .IF "$(COM)"=="GCC" - $(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)/$*.obj $(MISC)/$*.c + $(COMMAND_ECHO)$(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)/$*.obj $(MISC)/$*.c .ELSE - $(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)/$*.obj $(MISC)/$*.c + $(COMMAND_ECHO)$(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)/$*.obj $(MISC)/$*.c .ENDIF .ENDIF .IF "$(nodep)"=="" - $(MAKEDEPEND) @$(mktmp -f - -p$(OBJ) $(MKDEPFLAGS) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $< ) > $(MISC)/o_$(@:f:s/.obj/.dpcc/) + $(COMMAND_ECHO)$(MAKEDEPEND) @$(mktmp -f - -p$(OBJ) $(MKDEPFLAGS) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $< ) > $(MISC)/o_$(@:f:s/.obj/.dpcc/) @noop $(assign DEPS_MADE+:=o_$(@:f:s/.obj/.dpcc/)) .ENDIF # "$(nodep)"=="" $(SLO)/%.obj : $(MISC)/%.c - @echo Making: $@ + @echo Compiling: $(PRJNAME)/$(OUTPATH)/misc/$(<:f) .IF "$(GUI)"=="UNX" @$(RM) $@ $(@:s/.obj/.o/) - $(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)/$*.o $(MISC)/$*.c + $(COMMAND_ECHO)$(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)/$*.o $(MISC)/$*.c .IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"=="" - $(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/) + $(COMMAND_ECHO)$(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/) .ENDIF # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"=="" - $(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI) + @$(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI) .ELSE @@-$(RM) $@ .IF "$(COM)"=="GCC" - $(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)/$*.obj $(MISC)/$*.c + $(COMMAND_ECHO)$(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)/$*.obj $(MISC)/$*.c .ELSE - $(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)/$*.obj $(MISC)/$*.c + $(COMMAND_ECHO)$(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)/$*.obj $(MISC)/$*.c .ENDIF .ENDIF .IF "$(nodep)"=="" - $(MAKEDEPEND) @$(mktmp -f - -p$(SLO) $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $< ) > $(MISC)/s_$(@:f:s/.obj/.dpcc/) + $(COMMAND_ECHO)$(MAKEDEPEND) @$(mktmp -f - -p$(SLO) $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $< ) > $(MISC)/s_$(@:f:s/.obj/.dpcc/) # avoid _version objects (see tg_shl.mk) - quite hacky... @noop $(!eq,$@,$(@:s/_version.obj/.obj/) $(NULL) $(assign DEPS_MADE+:=s_$(@:f:s/.obj/.dpcc/))) .ENDIF # "$(nodep)"=="" $(SLO)/%.obj : %.c - @echo Making: $@ + @echo Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$< .IF "$(GUI)"=="UNX" @$(RM) $@ $(@:s/.obj/.o/) - $(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)/$*.o $*.c + $(COMMAND_ECHO)$(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)/$*.o $*.c .IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"=="" - $(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/) + $(COMMAND_ECHO)$(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/) .ENDIF # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"=="" - $(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI) + @$(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI) .ELSE @@-$(RM) $@ .IF "$(COM)"=="GCC" - $(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)/$*.obj $*.c + $(COMMAND_ECHO)$(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)/$*.obj $*.c .ELSE - $(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)/$*.obj $*.c + $(COMMAND_ECHO)$(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)/$*.obj $*.c .ENDIF .ENDIF .IF "$(nodep)"=="" - $(MAKEDEPEND) @$(mktmp -f - -p$(SLO) $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $< ) > $(MISC)/s_$(@:f:s/.obj/.dpcc/) + $(COMMAND_ECHO)$(MAKEDEPEND) @$(mktmp -f - -p$(SLO) $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $< ) > $(MISC)/s_$(@:f:s/.obj/.dpcc/) @noop $(assign DEPS_MADE+:=s_$(@:f:s/.obj/.dpcc/)) .ENDIF # "$(nodep)"=="" # Objective-C files $(OBJ)/%.obj : %.m - @echo Making: $@ + @echo Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$< .IF "$(OS)"=="MACOSX" .IF "$(TEST)"!="" - $(objc) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(OBJCFLAGS) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) -E $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $*.m + $(COMMAND_ECHO)$(objc) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(OBJCFLAGS) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) -E $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $*.m .ELSE @$(RM) $@ $(@:s/.obj/.o/) - $(objc) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(OBJCFLAGS) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $*.m - $(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI) + $(COMMAND_ECHO)$(objc) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(OBJCFLAGS) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $*.m + @$(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI) .ENDIF .ELSE # "$(OS)"=="MACOSX" @echo "No recipe for compiling Objective-C files is available for this platform" @@ -404,33 +404,33 @@ $(OBJ)/%.obj : %.m # Objective-C files $(OBJ)/%.obj : $(MISC)/%.m - @echo Making: $@ + @echo Compiling: $(PRJNAME)/$(OUTPATH)/misc/$(<:f) .IF "$(OS)"=="MACOSX" @$(RM) $@ $(@:s/.obj/.o/) - $(objc) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(OBJCFLAGS) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $(MISC)/$*.m - $(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI) + $(COMMAND_ECHO)$(objc) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(OBJCFLAGS) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $(MISC)/$*.m + @$(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI) .ELSE # "$(OS)"=="MACOSX" @echo "No recipe for compiling Objective-C files is available for this platform" .ENDIF "$(OS)"=="MACOSX" # Objective-C files $(SLO)/%.obj : $(MISC)/%.m - @echo Making: $@ + @echo Compiling: $(PRJNAME)/$(OUTPATH)/misc/$(<:f) .IF "$(OS)"=="MACOSX" @$(RM) $@ $(@:s/.obj/.o/) - $(objc) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(OBJCFLAGS) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)/$*.o $(MISC)/$*.m - $(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI) + $(COMMAND_ECHO)$(objc) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(OBJCFLAGS) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)/$*.o $(MISC)/$*.m + @$(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI) .ELSE # "$(OS)"=="MACOSX" @echo "No recipe for compiling Objective-C files is available for this platform" .ENDIF "$(OS)"=="MACOSX" # Objective-C files $(SLO)/%.obj : %.m - @echo Making: $@ + @echo Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$< .IF "$(OS)"=="MACOSX" @$(RM) $@ $(@:s/.obj/.o/) - $(objc) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(OBJCFLAGS) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)/$*.o $*.m - $(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI) + $(COMMAND_ECHO)$(objc) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(OBJCFLAGS) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)/$*.o $*.m + @$(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI) .ELSE # "$(OS)"=="MACOSX" @echo "No recipe for compiling Objective-C files is available for this platform" .ENDIF "$(OS)"=="MACOSX" @@ -442,17 +442,17 @@ not_existing/o_%.dpcc : %.c;@noop $(assign all_local_obj+:=$<) # Objective-C++ files $(OBJ)/%.obj : %.mm - @echo Making: $@ + @echo Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$< .IF "$(OS)"=="MACOSX" .IF "$(TEST)"!="" - $(objcpp) $(CFLAGS) $(INCLUDE) $(CFLAGSCC) $(OBJCXXFLAGS) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) -E $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $*.mm + $(COMMAND_ECHO)$(objcpp) $(CFLAGS) $(INCLUDE) $(CFLAGSCC) $(OBJCXXFLAGS) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) -E $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $*.mm .ELSE @$(RM) $@ $(@:s/.obj/.o/) - $(objcpp) $(CFLAGS) $(INCLUDE) $(CFLAGSCC) $(OBJCXXFLAGS) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $*.mm - $(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI) + $(COMMAND_ECHO)$(objcpp) $(CFLAGS) $(INCLUDE) $(CFLAGSCC) $(OBJCXXFLAGS) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $*.mm + @$(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI) .ENDIF .IF "$(nodep)"=="" - $(MAKEDEPEND) @$(mktmp -f - -p$(OBJ) $(MKDEPFLAGS) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $< ) > $(MISC)/o_$(@:f:s/.obj/.dpcc/) + $(COMMAND_ECHO)$(MAKEDEPEND) @$(mktmp -f - -p$(OBJ) $(MKDEPFLAGS) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $< ) > $(MISC)/o_$(@:f:s/.obj/.dpcc/) @noop $(assign DEPS_MADE+:=o_$(@:f:s/.obj/.dpcc/)) .ENDIF # "$(nodep)"=="" .ELSE # "$(OS)"=="MACOSX" @@ -461,13 +461,13 @@ $(OBJ)/%.obj : %.mm # Objective-C++ files $(OBJ)/%.obj : $(MISC)/%.mm - @echo Making: $@ + @echo Compiling: $(PRJNAME)/$(OUTPATH)/misc/$(<:f) .IF "$(OS)"=="MACOSX" @$(RM) $@ $(@:s/.obj/.o/) - $(objcpp) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(OBJCXXFLAGS) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $(MISC)/$*.mm - $(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI) + $(COMMAND_ECHO)$(objcpp) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(OBJCXXFLAGS) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $(MISC)/$*.mm + @$(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI) .IF "$(nodep)"=="" - $(MAKEDEPEND) @$(mktmp -f - -p$(OBJ) $(MKDEPFLAGS) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $< ) > $(MISC)/o_$(@:f:s/.obj/.dpcc/) + $(COMMAND_ECHO)$(MAKEDEPEND) @$(mktmp -f - -p$(OBJ) $(MKDEPFLAGS) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $< ) > $(MISC)/o_$(@:f:s/.obj/.dpcc/) @noop $(assign DEPS_MADE+:=o_$(@:f:s/.obj/.dpcc/)) .ENDIF # "$(nodep)"=="" .ELSE # "$(OS)"=="MACOSX" @@ -476,13 +476,13 @@ $(OBJ)/%.obj : $(MISC)/%.mm # Objective-C++ files $(SLO)/%.obj : $(MISC)/%.mm - @echo Making: $@ + @echo Compiling: $(PRJNAME)/$(OUTPATH)/misc/$(<:f) .IF "$(OS)"=="MACOSX" @$(RM) $@ $(@:s/.obj/.o/) - $(objcpp) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(OBJCXXFLAGS) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)/$*.o $(MISC)/$*.mm - $(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI) + $(COMMAND_ECHO)$(objcpp) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(OBJCXXFLAGS) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)/$*.o $(MISC)/$*.mm + @$(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI) .IF "$(nodep)"=="" - $(MAKEDEPEND) @$(mktmp -f - -p$(SLO) $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $< ) > $(MISC)/s_$(@:f:s/.obj/.dpcc/) + $(COMMAND_ECHO)$(MAKEDEPEND) @$(mktmp -f - -p$(SLO) $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $< ) > $(MISC)/s_$(@:f:s/.obj/.dpcc/) @noop $(assign DEPS_MADE+:=s_$(@:f:s/.obj/.dpcc/)) .ENDIF # "$(nodep)"=="" .ELSE # "$(OS)"=="MACOSX" @@ -491,13 +491,13 @@ $(SLO)/%.obj : $(MISC)/%.mm # Objective-C++ files $(SLO)/%.obj : %.mm - @echo Making: $@ + @echo Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$< .IF "$(OS)"=="MACOSX" @$(RM) $@ $(@:s/.obj/.o/) - $(objcpp) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(OBJCXXFLAGS) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)/$*.o $*.mm - $(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI) + $(COMMAND_ECHO)$(objcpp) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(OBJCXXFLAGS) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)/$*.o $*.mm + @$(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI) .IF "$(nodep)"=="" - $(MAKEDEPEND) @$(mktmp -f - -p$(SLO) $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $< ) > $(MISC)/s_$(@:f:s/.obj/.dpcc/) + $(COMMAND_ECHO)$(MAKEDEPEND) @$(mktmp -f - -p$(SLO) $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $< ) > $(MISC)/s_$(@:f:s/.obj/.dpcc/) @noop $(assign DEPS_MADE+:=s_$(@:f:s/.obj/.dpcc/)) .ENDIF # "$(nodep)"=="" .ELSE # "$(OS)"=="MACOSX" @@ -505,7 +505,7 @@ $(SLO)/%.obj : %.mm .ENDIF # "$(OS)"=="MACOSX" $(MISC)/%.dpslo : - @echo making .dpslo + @echo "Making: " $(@:f) @@$(RM) $@ @@-$(CDD) $(MISC) && $(!null,$(all_local_slo) $(TYPE:s/+//) echo #) $(foreach,i,$(all_local_slo:b:+".dpcc") s_$(i)) > $(@:f) @@-$(CDD) $(MISC) && $(!null,$(all_misc_slo) $(TYPE:s/+//) echo #) $(foreach,i,$(all_misc_slo:b:+".dpcc") s_$(i)) >> $(@:f) @@ -513,7 +513,7 @@ $(MISC)/%.dpslo : @$(TYPE) $(mktmp $(TARGET)_known_dpcc+=$(all_local_slo:b:+".dpcc":^"s_") $(all_misc_slo:b:+".dpcc":^"s_")) >> $@ $(MISC)/%.dpobj : - @echo making .dpobj + @echo "Making: " $(@:f) @@$(RM) $@ @@-$(CDD) $(MISC) && $(!null,$(all_local_obj) $(TYPE:s/+//) echo #) $(foreach,i,$(all_local_obj:b:+".dpcc") o_$(i)) > $(@:f) @@-$(CDD) $(MISC) && $(!null,$(all_misc_obj) $(TYPE:s/+//) echo #) $(foreach,i,$(all_misc_obj:b:+".dpcc") o_$(i)) >> $(@:f) @@ -543,29 +543,29 @@ not_existing/o_%.dpcc : $(MISC)/%.mm;@noop $(assign all_misc_obj+:=$<) $(MISC)/s_%.dpcc : %.m @@-$(RM) $@ - @$(MAKEDEPEND) -f - -p$(SLO) $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $< > $@ + $(COMMAND_ECHO)$(MAKEDEPEND) -f - -p$(SLO) $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $< > $@ @echo $@ : $(SLO)/$(<:b).obj >> $@ $(MISC)/o_%.dpcc : %.m @@-$(RM) $@ - @$(MAKEDEPEND) -f - -p$(OBJ) $(MKDEPFLAGS) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $< > $@ + $(COMMAND_ECHO)$(MAKEDEPEND) -f - -p$(OBJ) $(MKDEPFLAGS) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $< > $@ @echo $@ : $(OBJ)/$(<:b).obj >> $@ $(MISC)/s_%.dpcc : $(MISC)/%.m @@-$(RM) $@ .IF "$(GUI)"=="UNX" - @$(MAKEDEPEND) -f - -p$(SLO) $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $< | sed s\#$(MISC)/\#\# > $@ + $(COMMAND_ECHO)$(MAKEDEPEND) -f - -p$(SLO) $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $< | sed s\#$(MISC)/\#\# > $@ .ELSE # "$(GUI)"=="UNX" - @$(MAKEDEPEND) -f - -p$(SLO) $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $< | $(SED) s/$(MISC:s/\/\\/)\\// > $@ + $(COMMAND_ECHO)$(MAKEDEPEND) -f - -p$(SLO) $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $< | $(SED) s/$(MISC:s/\/\\/)\\// > $@ .ENDIF # "$(GUI)"=="UNX" @echo $@ : $(SLO)/$(<:b).obj >> $@ $(MISC)/o_%.dpcc : $(MISC)/%.m @@-$(RM) $@ .IF "$(GUI)"=="UNX" - @$(MAKEDEPEND) -f - -p$(OBJ) $(MKDEPFLAGS) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $< | sed s\#$(MISC)/\#\# > $@ + $(COMMAND_ECHO)$(MAKEDEPEND) -f - -p$(OBJ) $(MKDEPFLAGS) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $< | sed s\#$(MISC)/\#\# > $@ .ELSE # "$(GUI)"=="UNX" - @$(MAKEDEPEND) -f - -p$(OBJ) $(MKDEPFLAGS) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $< | $(SED) s/$(MISC:s/\/\\/)\\// > $@ + $(COMMAND_ECHO)$(MAKEDEPEND) -f - -p$(OBJ) $(MKDEPFLAGS) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $< | $(SED) s/$(MISC:s/\/\\/)\\// > $@ .ENDIF # "$(GUI)"=="UNX" @echo $@ : $(OBJ)/$(<:b).obj >> $@ @@ -573,7 +573,7 @@ $(MISC)/o_%.dpcc : $(MISC)/%.m $(MISC)/s_%.dpcc : %.s @@-$(RM) $@ - @$(MAKEDEPEND) -f - -p$(SLO) $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $< > $@ + $(COMMAND_ECHO)$(MAKEDEPEND) -f - -p$(SLO) $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $< > $@ @echo $@ : $(SLO)/$(<:b).obj >> $@ $(MISC)/s_%.dpcc : $(SLO)/%.obj @@ -587,7 +587,7 @@ $(MISC)/o_%.dpcc : $(OBJ)/%.obj $(MISC)/%.dpsc : @@-$(RM) $@ @@-$(MKDIR) $(MISC)/{$(subst,$(@:d:d:d), $(@:d:d))} - @$(MAKEDEPEND) -f - -p$(PAR)/{$(subst,$(@:d:d:d), $(@:d:d))} -o.par -D{$(subst,$(@:d:d:d:u), $(@:d:d:u))}_PRODUCT $(CDEFS) -DDLLPOSTFIX=$(DLLPOSTFIX) -I. -I$(INC) -I$(INCLOCAL) -I$(INCGUI) -I$(INCCOM) $(*:b).scp > $@ + $(COMMAND_ECHO)$(MAKEDEPEND) -f - -p$(PAR)/{$(subst,$(@:d:d:d), $(@:d:d))} -o.par -D{$(subst,$(@:d:d:d:u), $(@:d:d:u))}_PRODUCT $(CDEFS) -DDLLPOSTFIX=$(DLLPOSTFIX) -I. -I$(INC) -I$(INCLOCAL) -I$(INCGUI) -I$(INCCOM) $(*:b).scp > $@ @echo $@ : $(PAR)/{$(subst,$(@:d:d:d), $(@:d:d))}/$(*:b).par >> $@ @echo $(PAR)/{$(subst,$(@:d:d:d), $(@:d:d))}/$(*:b).par : $(*:b).scp >> $@ @@ -595,34 +595,34 @@ $(MISC)/%.dpsc : $(MISC)/%.dprc : @@-$(RM) $@ - @$(MAKEDEPEND) -f - -p$(RES) -o.res $(RCLANGFLAGS_{$(subst,$(@:d:d:d:u), $(@:d:d:u))}:u:s/ //) $(CDEFS) -DDLLPOSTFIX=$(DLLPOSTFIX) -I. -I$(INC) -I$(INCLOCAL) -I$(INCGUI) -I$(INCCOM) -I$(SOLARENV)/inc $(*:b).rc >> $@ + $(COMMAND_ECHO)$(MAKEDEPEND) -f - -p$(RES) -o.res $(RCLANGFLAGS_{$(subst,$(@:d:d:d:u), $(@:d:d:u))}:u:s/ //) $(CDEFS) -DDLLPOSTFIX=$(DLLPOSTFIX) -I. -I$(INC) -I$(INCLOCAL) -I$(INCGUI) -I$(INCCOM) -I$(SOLARENV)/inc $(*:b).rc >> $@ # @echo $@ : $(RES)/{$(subst,$(@:d:d:d), $(@:d:d))}/$(*:b).res >> $@ @echo $@ : $(RES)/$(*:b).res >> $@ $(MISC)/%.dpr : - @echo ------------------------------ + @@noop .IF "$(nodep)"=="" - @echo Making: $@ + @echo "Making: " $(@:f) @@-$(RM) $@ - dmake $(MFLAGS) $(MAKEFILE) $(CALLMACROS) NO_HIDS=true make_srs_deps=true $(DEPSRSFILES) - -$(TYPE) $(MISC)/$(TARGET).*.dprr >> $@ + $(COMMAND_ECHO)dmake $(MFLAGS) $(MAKEFILE) $(CALLMACROS) NO_HIDS=true make_srs_deps=true $(DEPSRSFILES) + $(COMMAND_ECHO)-$(TYPE) $(MISC)/$(TARGET).*.dprr >> $@ .ENDIF # "$(nodep)"=="" $(MISC)/%.dpz : - @echo ------------------------------ + @@noop .IF "$(nodep)"=="" - @echo Making: $@ + @echo "Making: " $(@:f) @@-$(RM) $@ - dmake $(MFLAGS) $(MAKEFILE) $(CALLMACROS) make_zip_deps=true $(ZIPDEPFILES) - $(TYPE) $(ZIPDEPFILES) $(mktmp $(NULL)) | grep -v "CVS" | grep -v "\.svn" >> $@ - echo zipdep_langs=$(alllangiso) >> $@ + $(COMMAND_ECHO)dmake $(MFLAGS) $(MAKEFILE) $(CALLMACROS) make_zip_deps=true $(ZIPDEPFILES) + $(COMMAND_ECHO)$(TYPE) $(ZIPDEPFILES) $(mktmp $(NULL)) | grep -v "CVS" | grep -v "\.svn" >> $@ + @echo zipdep_langs=$(alllangiso) >> $@ @@-$(RM) $(ZIPDEPFILES) .ENDIF # "$(nodep)"=="" # Dependencies fuer java - Files $(MISC)/%.dpj : - @echo Making dpj... + @echo "Making: " $(@:f) .IF "$(nodep)"!="" .IF "$(GUI)"=="UNX" @echo > $@ @@ -639,50 +639,50 @@ $(MISC)/%.dpj : .ENDIF # "$(nodep)"=="" $(SLO)/%.obj : %.asm - @echo Making: $@ + @echo Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$< .IF "$(COM)"=="GCC" .IF "$(ASM)"=="ml" - $(ASM) $(AFLAGS) -D$(COM) /Fo$(SLO)/$*.obj $*.asm + $(COMMAND_ECHO)$(ASM) $(AFLAGS) -D$(COM) /Fo$(SLO)/$*.obj $*.asm @@-$(RM) $*.err .ELSE # "$(ASM)"=="ml" @@-$(RM) $@ - $(ASM) $(AFLAGS) $*.asm,$(SLO)/$*.obj; + $(COMMAND_ECHO)$(ASM) $(AFLAGS) $*.asm,$(SLO)/$*.obj; .ENDIF # "$(ASM)"=="ml" .ELSE .IF "$(COM)"=="WTC" - $(ASM) $(AFLAGS) -D$(COM) $*.asm -fo=$(SLO)/$*.obj - -$(IFEXIST) $*.err $(THEN) $(RM:s/+//) $*.err $(FI) + $(COMMAND_ECHO)$(ASM) $(AFLAGS) -D$(COM) $*.asm -fo=$(SLO)/$*.obj + @-$(IFEXIST) $*.err $(THEN) $(RM:s/+//) $*.err $(FI) .ELSE .IF "$(COM)"=="MSC" .IF "$(ASM)"=="ml" - $(ASM) $(AFLAGS) -D$(COM) /Fo$(SLO)/$*.obj $*.asm - -$(IFEXIST) $*.err $(THEN) $(RM:s/+//) $*.err $(FI) + $(COMMAND_ECHO)$(ASM) $(AFLAGS) -D$(COM) /Fo$(SLO)/$*.obj $*.asm + @-$(IFEXIST) $*.err $(THEN) $(RM:s/+//) $*.err $(FI) .ELSE # "$(ASM)"=="ml" @@-$(RM) $@ - $(ASM) $(AFLAGS) $*.asm,$(SLO)/$*.obj; + $(COMMAND_ECHO)$(ASM) $(AFLAGS) $*.asm,$(SLO)/$*.obj; .ENDIF # "$(ASM)"=="ml" .ENDIF "$(COM)"=="MSC" .ENDIF .ENDIF $(OBJ)/%.obj : %.asm - @echo Making: $@ + @echo Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$< .IF "$(COM)"=="GCC" .IF "$(ASM)"=="ml" - $(ASM) $(AFLAGS) -D$(COM) /Fo$(OBJ)/$*.obj $*.asm + $(COMMAND_ECHO)$(ASM) $(AFLAGS) -D$(COM) /Fo$(OBJ)/$*.obj $*.asm @@-$(RM) $*.err .ELSE # "$(ASM)"=="ml" @@-$(RM) $@ - $(ASM) $(AFLAGS) $*.asm,$(OBJ)/$*.obj; + $(COMMAND_ECHO)$(ASM) $(AFLAGS) $*.asm,$(OBJ)/$*.obj; .ENDIF # "$(ASM)"=="ml" .ELSE .IF "$(COM)"=="MSC" .IF "$(ASM)"=="ml" - $(ASM) $(AFLAGS) -D$(COM) /Fo$(SLO)/$*.obj $*.asm - -$(IFEXIST) $*.err $(THEN) $(RM:s/+//) $*.err $(FI) + $(COMMAND_ECHO)$(ASM) $(AFLAGS) -D$(COM) /Fo$(SLO)/$*.obj $*.asm + @-$(IFEXIST) $*.err $(THEN) $(RM:s/+//) $*.err $(FI) .ELSE # "$(ASM)"=="ml" @$(IFEXIST) $@ $(THEN) $(RM:s/+//) $@ >& $(NULLDEV) $(FI) - $(ASM) $(AFLAGS) $*.asm,$(OBJ)/$*.obj; + $(COMMAND_ECHO)$(ASM) $(AFLAGS) $*.asm,$(OBJ)/$*.obj; .ENDIF # "$(ASM)"=="ml" .ENDIF "$(COM)"=="MSC" .ENDIF @@ -695,17 +695,17 @@ $(OUT)/ucrdoc/$(IDLPACKAGE)/%.urd : %.idl # generate hid files $(SRS)/%.hid : %.src - @echo Making hid $@ - $(AUGMENT_LIBRARY_PATH) $(PERL) $(SOLARENV)/bin/mhids.pl $*.src $(SRS) $(PRJNAME) $(CDEFS) $(INCLUDE) + @echo Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$(*:f).src + $(COMMAND_ECHO)$(AUGMENT_LIBRARY_PATH) $(PERL) $(SOLARENV)/bin/mhids.pl $*.src $(SRS) $(PRJNAME) $(CDEFS) $(INCLUDE) # make *.xml descriptions available in $(MISC) $(MISC)/%$($(WINVERSIONNAMES)_MAJOR).xml : %.xml - $(COPY) $< $@ + $(COMMAND_ECHO)$(COPY) $< $@ # dummy rule to make sure xml file is in place when used in settings.mk $(MISC)/%.mk : $(MISC)/%$($(WINVERSIONNAMES)_MAJOR).xml - $(TOUCH) $@ - echo XML2MK_FILES += $(@:b) >> $@ + @$(TOUCH) $@ + @echo XML2MK_FILES += $(@:b) >> $@ #generate descriptions from xml $(MISC)/%$($(WINVERSIONNAMES)_MAJOR)_description.cxx : $(MISC)/%$($(WINVERSIONNAMES)_MAJOR).xml @@ -713,7 +713,7 @@ $(MISC)/%$($(WINVERSIONNAMES)_MAJOR)_description.cxx : $(MISC)/%$($(WINVERSIONNA #generate private rdb $(BIN)/%.rdb: $(MISC)/%$($(WINVERSIONNAMES)_MAJOR).xml - $(RDBMAKER) -BUCR -O$(BIN)/$*.rdb @$(mktmp $(foreach,i,$($(@:b)_XML2CMPTYPES) -T$i ) $(COMPRDB)) + $(COMMAND_ECHO)$(RDBMAKER) -BUCR -O$(BIN)/$*.rdb @$(mktmp $(foreach,i,$($(@:b)_XML2CMPTYPES) -T$i ) $(COMPRDB)) #strip dos lineends $(MISC)/%.sh : %.sh @@ -724,26 +724,26 @@ $(MISC)/%.sh : %.sh .IF "$(WITH_LANG)"!="" $(COMMONMISC)/$(TARGET)/%.ulf : %.ulf @echo "Making: " $(@:f) - -$(MKDIR) $(@:d) - -$(RM) $@ - $(ULFEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all - $(RENAME) $@.$(INPATH) $@ - -$(RM) $@.$(INPATH) + $(COMMAND_ECHO)-$(MKDIR) $(@:d) + $(COMMAND_ECHO)-$(RM) $@ + $(COMMAND_ECHO)$(ULFEX) $(ULFEX_VERBOSITY) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all + $(COMMAND_ECHO)$(RENAME) $@.$(INPATH) $@ + $(COMMAND_ECHO)-$(RM) $@.$(INPATH) $(COMMONMISC)/$(TARGET)/%.xrb : %.xrb - -$(MKDIR) $(@:d) - -$(RM) $@ - $(XMLEX) -t xrb -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all - $(RENAME) $@.$(INPATH) $@ - -$(RM) $@.$(INPATH) + $(COMMAND_ECHO)-$(MKDIR) $(@:d) + $(COMMAND_ECHO)-$(RM) $@ + $(COMMAND_ECHO)$(XMLEX) -t xrb -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all + $(COMMAND_ECHO)$(RENAME) $@.$(INPATH) $@ + $(COMMAND_ECHO)-$(RM) $@.$(INPATH) $(COMMONMISC)/$(MYPATH)/%.xrm : %.xrm - -$(MKDIRHIER) $(@:d) - -$(RM) $@ - echo trysdf = $(TRYSDF) - $(XRMEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all - $(RENAME) $@.$(INPATH) $@ - -$(RM) $@.$(INPATH) + $(COMMAND_ECHO)-$(MKDIRHIER) $(@:d) + $(COMMAND_ECHO)-$(RM) $@ + @echo trysdf = $(TRYSDF) + $(COMMAND_ECHO)$(XRMEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all + $(COMMAND_ECHO)$(RENAME) $@.$(INPATH) $@ + $(COMMAND_ECHO)-$(RM) $@.$(INPATH) #$(COMMONMISC)/$(TARGET)/%.xrm : %.xrm # -$(MKDIRHIER) $(@:d) @@ -766,10 +766,10 @@ $(COMMONMISC)/$(TARGET)/%.jlf : $$(@:db).ulf $(COMMONMISC)/$(TARGET)/%.jlf : $$(@:b).ulf .ENDIF # "$(WITH_LANG)"!="" @-$(MKDIRHIER) $(@:d) - -$(RM) $@ - $(ULFCONV) -o $@.$(INPATH) $< - $(RENAME) $@.$(INPATH) $@ - -$(RM) $@.$(INPATH) + $(COMMAND_ECHO)-$(RM) $@ + $(COMMAND_ECHO)$(ULFCONV) -o $@.$(INPATH) $< + $(COMMAND_ECHO)$(RENAME) $@.$(INPATH) $@ + $(COMMAND_ECHO)-$(RM) $@.$(INPATH) .IF "$(WITH_LANG)"!="" $(COMMONMISC)/$(TARGET)/%.mlf : $$(@:db).ulf @@ -777,7 +777,7 @@ $(COMMONMISC)/$(TARGET)/%.mlf : $$(@:db).ulf $(COMMONMISC)/$(TARGET)/%.mlf : $$(@:b).ulf .ENDIF # "$(WITH_LANG)"!="" @-$(MKDIRHIER) $(@:d) - -$(RM) $@ + @-$(RM) $@ @$(ULFCONV) -o $@.$(INPATH) -t $(SOLARBINDIR)/msi-encodinglist.txt $< @$(RENAME) $@.$(INPATH) $@ @-$(RM) $@.$(INPATH) @@ -788,18 +788,18 @@ $(COMMONMISC)/$(TARGET)/%.uulf : $$(@:db).ulf $(COMMONMISC)/$(TARGET)/%.uulf : $$(@:b).ulf .ENDIF # "$(WITH_LANG)"!="" @-$(MKDIRHIER) $(@:d) - -$(RM) $@ + $(COMMAND_ECHO)-$(RM) $@ @$(COPY) $< $@.$(INPATH) @$(RENAME) $@.$(INPATH) $@ @-$(RM) $@.$(INPATH) # This is still needed????? $(COMMONMISC)/$(TARGET)/%.xrm : %.xrm - -$(MKDIR) $(@:d) - -$(RM) $@ - $(XRMEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all - $(RENAME) $@.$(INPATH) $@ - -$(RM) $@.$(INPATH) + $(COMMAND_ECHO)-$(MKDIR) $(@:d) + $(COMMAND_ECHO)-$(RM) $@ + $(COMMAND_ECHO)$(XRMEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all + $(COMMAND_ECHO)$(RENAME) $@.$(INPATH) $@ + $(COMMAND_ECHO)-$(RM) $@.$(INPATH) # dirty hack # if local *.sdf file is missing -- cgit From 3cc7d76742d0203f6cabca047cd7789363673930 Mon Sep 17 00:00:00 2001 From: Hans-Joachim Lankenau Date: Wed, 25 Nov 2009 11:49:21 +0100 Subject: ause106: #161178# remove -ca switch; remove trailing blanks; add NSIS_PATH to local env (-cap/-cax) --- solenv/config/sdev300.ini | 1644 ++++++++++++++++++++------------------------- 1 file changed, 735 insertions(+), 909 deletions(-) (limited to 'solenv') diff --git a/solenv/config/sdev300.ini b/solenv/config/sdev300.ini index efee6a3e61b8..23d26748848d 100644 --- a/solenv/config/sdev300.ini +++ b/solenv/config/sdev300.ini @@ -1,12 +1,12 @@ -common +common { - environment + environment { - btarget + btarget { BTARGET btarget=%BUILD_TARGET% } - common + common { ADDED_MODULES solenv default_images custom_images ooo_custom_images external_images postprocess instset_native instsetoo_native smoketest_native smoketestoo_native BIG_SVX TRUE @@ -73,7 +73,7 @@ common { ENABLE_CRASHDUMP DUMMY } - crashdump + crashdump { ENABLE_CRASHDUMP STATIC } @@ -85,7 +85,7 @@ common { MAXPROC maxproc=%MAXPROCESS% } - nojava + nojava { DISABLE_JAVA TRUE } @@ -112,71 +112,71 @@ common { LU_RFLAG r_only } - shell + shell { SHELL %STAR_USE_SHELL% USE_SHELL %STAR_USE_SHELL% } - tmp + tmp { SOL_TMP %SOL_TMP_DIR% } - verbose + verbose { VERBOSE VERBOSE } - zipsource + zipsource { ZIPSOURCE zipsource=%ZIP_SOURCE_URL% } } - extern + extern { - ENVROOT - PATH - SRC_ROOT - STL_ROOT - UPDATER + ENVROOT + PATH + SRC_ROOT + STL_ROOT + UPDATER } order common:2 common:3 pro:0 pro:1 common common:0 btarget zipsource cwsname common:1 nojava shell tmp crashdump maxproc hg r_only nosource - reset + reset { ALT_L10N_MODULE - ENVCFLAGS - HOMEDRIVE - HOMEPATH - JAVAHOME - JAVA_HOME + ENVCFLAGS + HOMEDRIVE + HOMEPATH + JAVAHOME + JAVA_HOME LU_HGFLAG LU_NOSOURCE LU_RFLAGS MKDIRHIER - PROEXT - PROFULLSWITCH - SHIPDRIVE - SOLARSRC - SOLAR_JAVA - SPEW - STLPORT4 + PROEXT + PROFULLSWITCH + SHIPDRIVE + SOLARSRC + SOLAR_JAVA + SPEW + STLPORT4 UPDMINOREXT - WITH_FONTOOO - WITH_LANG + WITH_FONTOOO + WITH_LANG } - restore + restore { - PATH + PATH } - standlst + standlst { DRIVE_O %WORK_STAMP%/drives/o:/UnixVolume DRIVE_S %WORK_STAMP%/drives/s:/UnixVolume } - switches + switches { btarget BUILD_TARGET - crashdump + crashdump cwsname CWS_WORK_STAMP - envroot + envroot hg nojava nosource @@ -189,37 +189,32 @@ common zipsource ZIP_SOURCE_URL } } -finish +finish { - environment + environment { - ca + cap { SOLARSRC %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT% SOURCE_ROOT_DIR $expand(%SOLARSRC%/..) } - cap - { - SOLARSRC %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT% - SOURCE_ROOT_DIR $expand(%SOLARSRC%/..) - } - cax + cax { SOLARSRC %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT% SOURCE_ROOT_DIR $expand(%SOLARSRC%/..) } common_0:0 IF %OS% == MACOSX { - ENABLE_GCONF - ENABLE_GNOMEVFS - ENABLE_GTK + ENABLE_GCONF + ENABLE_GNOMEVFS + ENABLE_GTK SOLARINCLUDES -I%SOLARVERSION%$/%INPATH%$/inc%UPDMINOREXT% -I%SOLARENV%$/%OUTPATH%$/inc -I%SOLARENV%$/inc %SOLAREXTRAINC% } common_0:3 IF %SOLARINCLUDES% == { SOLARINCLUDES -I%SOLARVERSION%$/%INPATH%$/inc%UPDMINOREXT% %PSDKINC% -I%COMPATH%$/include -I%SOLARENV%$/inc %SOLAREXTRAINC% } - common_1 + common_1 { BISON_HAIRY %SOLARROOT%$/btools$/bison.hairy BISON_SIMPLE %SOLARROOT%$/btools$/bison.simple @@ -250,8 +245,8 @@ finish } cwsname:0 IF X%SOURCE_ROOT_USED%X == XX { - *build - *deliver + *build + *deliver DMAKEROOT SOURCE_ROOT_not_used SOLARINC SOURCE_ROOT_not_used SOLARINCLUDE SOURCE_ROOT_not_used @@ -265,8 +260,8 @@ finish } cwsname:1 IF X%SOURCE_ROOT%X == XX { - *build - *deliver + *build + *deliver DMAKEROOT SOURCE_ROOT_not_set SOLARINC SOURCE_ROOT_not_set SOLARINCLUDE SOURCE_ROOT_not_set @@ -280,8 +275,8 @@ finish } cwsname:2 IF X%UPDMINOR%X == XX { - *build - *deliver + *build + *deliver DMAKEROOT UPDMINOR_not_used SOLARINC UPDMINOR_not_used SOLARINCLUDE UPDMINOR_not_used @@ -293,63 +288,53 @@ finish SO_GEN_ERROR2 ...resetting path to source tree SRC_ROOT UPDMINOR_not_used } - jdk13 + jdk13 { CLASSPATH .$;%JAVA_HOME%$/jre$/lib$/rt.jar ILIB %LIB%$;%JDKLIB% LIB %LIB%$;%JDKLIB% } - jdk14 + jdk14 { CLASSPATH .$;%JAVA_HOME%$/jre$/lib$/rt.jar ILIB %LIB%$;%JDKLIB% LIB %LIB%$;%JDKLIB% } - jdk15 + jdk15 { CLASSPATH .$;%JAVA_HOME%$/jre$/lib$/rt.jar ILIB %LIB%$;%JDKLIB% LIB %LIB%$;%JDKLIB% } - l10n + l10n { framework %L10N_framework% L10N-framework %L10N_framework% } - ojdk16 + ojdk16 { CLASSPATH .$;%JAVA_HOME%$/jre$/lib$/rt.jar ILIB %LIB%$;%JDKLIB% LIB %LIB%$;%JDKLIB% } } - order cwsname:0 cwsname:1 cwsname:2 common_0:0 common_0:1 common_0:2 common_0:3 jdk13 jdk14 jdk15 ojdk16 common_1 common_2:0 l10n common_jre:0 common_jre:1 ca cax cap common_a - switches + order cwsname:0 cwsname:1 cwsname:2 common_0:0 common_0:1 common_0:2 common_0:3 jdk13 jdk14 jdk15 ojdk16 common_1 common_2:0 l10n common_jre:0 common_jre:1 cax cap common_a + switches { cwsname CWS_WORK_STAMP } } -unxfbsdi +unxfbsdi { - environment + environment { - bs_sourceroot + bs_sourceroot { SOLAR_SOURCE_ROOT %SOURCE_ROOT_TMP% SOURCE_ROOT %SOURCE_ROOT_TMP% SOURCE_ROOT_USED TRUE } - ca - { - COPYALL TRUE - DEVROOT %SOL_TMP%$/r - PCLEAN_PATH %SOLARROOT%/etools - SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv - SOLARROOT %SOL_TMP%$/r - SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP% - SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP% - } - cap + cap { COPYALL TRUE COPY_PACKED TRUE @@ -361,7 +346,7 @@ unxfbsdi SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP% SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP% } - cax + cax { COPYALL FALSE DEVROOT %SOL_TMP%$/r @@ -372,7 +357,7 @@ unxfbsdi SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP% SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP% } - common + common { *build nice perl %SOLARENV%/bin/build.pl %PROFULLSWITCH% *build_client nice perl %SOLARENV%/bin/build_client.pl @@ -393,12 +378,12 @@ unxfbsdi SOLAR_JAVA TRUE ZIPDEP perl %SOLARENV%/bin/zipdep.pl } - common0 + common0 { SOLAR_ENV_ROOT /so/env SOLAR_SOURCE_ROOT %DRIVE_O% } - common1 + common1 { COMPATH %SOLAR_ENV_ROOT%$/gcc_3.0.1_linux_libc2.11_turbolinux DEVROOT %SOLAR_ENV_ROOT% @@ -415,7 +400,7 @@ unxfbsdi SO_PACK %SOLAR_ENV_ROOT%/pack/%WORK_STAMP% SRC_ROOT %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT% } - common2 + common2 { BUILD_TOOLS %SOLARROOT%/bt_unxfbsdi/bin COM GCC @@ -441,11 +426,11 @@ unxfbsdi TEMP /tmp TMP /tmp } - compath + compath { COMPATH %STAR_COMPATH% } - debug + debug { LD_LIBRARY_PATH %SOLARROOT%/solenv/unxlngi4/lib/debug:%LD_LIBRARY_PATH% } @@ -459,7 +444,7 @@ unxfbsdi { SOLAR_ENV_ROOT %ENV_ROOT% } - jdk13 + jdk13 { JAVA_HOME %JDK13PATH% JDKINC %JDK13PATH%/include:%JDK13PATH%/include/linux @@ -474,7 +459,7 @@ unxfbsdi { SOLAR_JDK13PATH %JDK_PATH% } - jdk14 + jdk14 { JAVA_HOME %JDK14PATH% JDKINC %JDK14PATH%/include:%JDK14PATH%/include/linux @@ -489,7 +474,7 @@ unxfbsdi { SOLAR_JDK14PATH %JDK_PATH% } - jdk15 + jdk15 { JAVA_HOME %JDK15PATH% JDKINC %JDK15PATH%/include:%JDK15PATH%/include/linux @@ -504,11 +489,11 @@ unxfbsdi { SOLAR_JDK15PATH %JDK_PATH% } - nativecvs + nativecvs { *cvs %STAR_NATIVECVS% } - pre + pre { ILIB %PRE%/lib:%ILIB% LD_LIBRARY_PATH %PRE%/lib:%LD_LIBRARY_PATH% @@ -516,7 +501,7 @@ unxfbsdi SOLARINC -I. -I%PRE%/inc %SOLARINC% SOLARLIB -L%PRE%/lib %SOLARLIB% -L/usr/X11R6/lib } - pro + pro { PROSWITCH -DPRODUCT } @@ -534,39 +519,39 @@ unxfbsdi { SOLAR_STLPATH %SOLARVERSION%$/%INPATH%$/inc%UPDMINOREXT%$/stl } - sysbaseroot + sysbaseroot { SOLAR_SYSBASE_ROOT %SYSBASE_ROOT% } } - extern + extern { - DIST_ROOT - ENV_ROOT - HOME - JDK_PATH - LOCALINI - SOL_TMP - SOURCE_ROOT - STL_ROOT - SYSBASE_ROOT - USER + DIST_ROOT + ENV_ROOT + HOME + JDK_PATH + LOCALINI + SOL_TMP + SOURCE_ROOT + STL_ROOT + SYSBASE_ROOT + USER } - order common0 bs_sourceroot envroot:0 sourceroot:0 sysbaseroot common1 jdk13path:0 jdk14path:0 jdk15path:0 distroot:0 nativecvs ca cap cax compath common2 pro stl:0 stl:1 common jdk13 jdk14 jdk15 debug pre - reset + order common0 bs_sourceroot envroot:0 sourceroot:0 sysbaseroot common1 jdk13path:0 jdk14path:0 jdk15path:0 distroot:0 nativecvs cap cax compath common2 pro stl:0 stl:1 common jdk13 jdk14 jdk15 debug pre + reset { - CLASSPATH - COPYALL + CLASSPATH + COPYALL } - restore + restore { - INCLUDE + INCLUDE } - script + script { - csh + csh { - 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE + 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pj all $ZIPSOURCE $BTARGET $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE 600: umask 002 800: rehash 850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR @@ -574,10 +559,10 @@ unxfbsdi 900: if ( "$?SO_GEN_ERROR" == 1 ) echo $SO_GEN_ERROR 901: if ( "$?SO_GEN_ERROR2" == 1 ) echo $SO_GEN_ERROR2 } - sh + sh { 400: if [ $COPYALL ]; then - 410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE + 410: $SOLAR_ENV_ROOT/etools/lucopy.pj all $ZIPSOURCE $BTARGET $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE 415: fi 600: umask 002 800: hash -r @@ -595,54 +580,42 @@ unxfbsdi 882: fi } } - switches + switches { bs_sourceroot SOURCE_ROOT_TMP - bsclient - ca - cap - cax + bsclient + cap + cax compath STAR_COMPATH - debug - distroot - envroot - jdk13 - jdk13path - jdk14 - jdk14path - jdk15 - jdk15path + debug + distroot + envroot + jdk13 + jdk13path + jdk14 + jdk14path + jdk15 + jdk15path l10n L10N_framework nativecvs STAR_NATIVECVS pre PRE - pro - sourceroot - stl - sysbaseroot + pro + sourceroot + stl + sysbaseroot } } -unxlngi6 +unxlngi6 { - environment + environment { - bs_sourceroot + bs_sourceroot { SOLAR_SOURCE_ROOT %SOURCE_ROOT_TMP% SOURCE_ROOT %SOURCE_ROOT_TMP% SOURCE_ROOT_USED TRUE } - ca - { - COPYALL TRUE - DEVROOT %SOL_TMP%$/r - PCLEAN_PATH %SOLARROOT%/etools - PERL %SOL_TMP%$/r$/bt_linux_libc2.32$/%WORK_STAMP%$/bin$/perl - SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv - SOLARROOT %SOL_TMP%$/r - SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP% - SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP% - } - cap + cap { COPYALL TRUE COPY_PACKED TRUE @@ -655,7 +628,7 @@ unxlngi6 SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP% SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP% } - cax + cax { COPYALL FALSE DEVROOT %SOL_TMP%$/r @@ -667,7 +640,7 @@ unxlngi6 SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP% SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP% } - common + common { *build nice %PERL% %SOLARENV%/bin/build.pl %PROFULLSWITCH% *build_client nice %PERL% %SOLARENV%/bin/build_client.pl @@ -691,15 +664,15 @@ unxlngi6 SOLAR_JAVA TRUE ZIPDEP %PERL% %SOLARENV%/bin/zipdep.pl } - common0 + common0 { SOLAR_ENV_ROOT /so/env SOLAR_SOURCE_ROOT %DRIVE_O% - SOLAR_SYSBASE_ROOT /so/env/gcc_4.2.3_linux_libc2.32/glibc2.3.2 + SOLAR_SYSBASE_ROOT /so/env/gcc_4.2.3_linux_libc2.32/glibc2.3.2 } - common1 + common1 { - COMPATH %SOLAR_ENV_ROOT%$/gcc_4.2.3_linux_libc2.32 + COMPATH %SOLAR_ENV_ROOT%$/gcc_4.2.3_linux_libc2.32 DEVROOT %SOLAR_ENV_ROOT% LFS_CFLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 PERL %SOLAR_ENV_ROOT%/bt_linux_libc2.32/%WORK_STAMP%/bin/perl @@ -717,7 +690,7 @@ unxlngi6 SO_PACK %SOLAR_ENV_ROOT%/pack/%WORK_STAMP% SRC_ROOT %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT% } - common2 + common2 { ENABLE_GRAPHITE TRUE BUILD_TOOLS %SOLARROOT%/bt_linux_libc2.32/%WORK_STAMP%/bin @@ -754,7 +727,7 @@ unxlngi6 { FORCE2ARCHIVE TRUE } - compath + compath { COMPATH %STAR_COMPATH% } @@ -768,7 +741,7 @@ unxlngi6 { SOLAR_ENV_ROOT %ENV_ROOT% } - jdk13 + jdk13 { JAVA_HOME %JDK13PATH% JDKINC %JDK13PATH%/include:%JDK13PATH%/include/linux @@ -783,7 +756,7 @@ unxlngi6 { SOLAR_JDK13PATH %JDK_PATH% } - jdk14 + jdk14 { JAVA_HOME %JDK14PATH% JDKINC %JDK14PATH%/include:%JDK14PATH%/include/linux @@ -798,7 +771,7 @@ unxlngi6 { SOLAR_JDK14PATH %JDK_PATH% } - jdk15 + jdk15 { JAVA_HOME %JDK15PATH% JDKINC %JDK15PATH%/include:%JDK15PATH%/include/linux @@ -813,11 +786,11 @@ unxlngi6 { SOLAR_JDK15PATH %JDK_PATH% } - nativecvs + nativecvs { *cvs %STAR_NATIVECVS% } - ojdk16 + ojdk16 { JAVA_HOME %OJDK16PATH% JDKINC %OJDK16PATH%/include:%OJDK16PATH%/include/linux @@ -832,14 +805,14 @@ unxlngi6 { SOLAR_OJDK16PATH %JDK_PATH% } - pre + pre { ILIB %PRE%/lib:%ILIB% LIB %PRE%/lib:%LIB% SOLARINC -I. -I%PRE%/inc %SOLARINC% SOLARLIB -L%PRE%/lib %SOLARLIB% -L/usr/X11R6/lib } - pro + pro { PROSWITCH -DPRODUCT } @@ -857,39 +830,39 @@ unxlngi6 { SOLAR_STLPATH %SOLARVERSION%$/%INPATH%$/inc%UPDMINOREXT%$/stl } - sysbaseroot + sysbaseroot { SOLAR_SYSBASE_ROOT %SYSBASE_ROOT% } } - extern + extern { - DIST_ROOT - ENV_ROOT - HOME - JDK_PATH - LOCALINI - SOL_TMP - SOURCE_ROOT - STL_ROOT - SYSBASE_ROOT - USER + DIST_ROOT + ENV_ROOT + HOME + JDK_PATH + LOCALINI + SOL_TMP + SOURCE_ROOT + STL_ROOT + SYSBASE_ROOT + USER } - order common0 bs_sourceroot envroot:0 sourceroot:0 sysbaseroot common1 jdk13path:0 jdk14path:0 jdk15path:0 ojdk16path:0 distroot:0 nativecvs ca cap cax compath common2 pro common3:0 stl:0 stl:1 common jdk13 jdk14 jdk15 ojdk16 pre - reset + order common0 bs_sourceroot envroot:0 sourceroot:0 sysbaseroot common1 jdk13path:0 jdk14path:0 jdk15path:0 ojdk16path:0 distroot:0 nativecvs cap cax compath common2 pro common3:0 stl:0 stl:1 common jdk13 jdk14 jdk15 ojdk16 pre + reset { - CLASSPATH - COPYALL + CLASSPATH + COPYALL } - restore + restore { - INCLUDE + INCLUDE } - script + script { - csh + csh { - 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE + 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pj all $ZIPSOURCE $BTARGET $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE 600: umask 002 800: rehash 850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR @@ -897,10 +870,10 @@ unxlngi6 900: if ( "$?SO_GEN_ERROR" == 1 ) echo $SO_GEN_ERROR 901: if ( "$?SO_GEN_ERROR2" == 1 ) echo $SO_GEN_ERROR2 } - sh + sh { 400: if [ $COPYALL ]; then - 410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE + 410: $SOLAR_ENV_ROOT/etools/lucopy.pj all $ZIPSOURCE $BTARGET $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE 415: fi 600: umask 002 800: hash -r @@ -918,56 +891,44 @@ unxlngi6 882: fi } } - switches + switches { bs_sourceroot SOURCE_ROOT_TMP - bsclient - ca - cap - cax + bsclient + cap + cax compath STAR_COMPATH - debug - distroot - envroot - jdk13 - jdk13path - jdk14 - jdk14path - jdk15 - jdk15path + debug + distroot + envroot + jdk13 + jdk13path + jdk14 + jdk14path + jdk15 + jdk15path l10n L10N_framework nativecvs STAR_NATIVECVS - ojdk16 - ojdk16path + ojdk16 + ojdk16path pre PRE - pro - sourceroot - stl - sysbaseroot + pro + sourceroot + stl + sysbaseroot } } -unxlngx6 +unxlngx6 { - environment + environment { - bs_sourceroot + bs_sourceroot { SOLAR_SOURCE_ROOT %SOURCE_ROOT_TMP% SOURCE_ROOT %SOURCE_ROOT_TMP% SOURCE_ROOT_USED TRUE } - ca - { - COPYALL TRUE - DEVROOT %SOL_TMP%$/r - PCLEAN_PATH %SOLARROOT%/etools - PERL %SOL_TMP%$/r$/bt_linux_libc2.32$/%WORK_STAMP%$/bin$/perl - SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv - SOLARROOT %SOL_TMP%$/r - SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP% - SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP% - } - cap + cap { COPYALL TRUE COPY_PACKED TRUE @@ -980,7 +941,7 @@ unxlngx6 SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP% SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP% } - cax + cax { COPYALL FALSE DEVROOT %SOL_TMP%$/r @@ -992,7 +953,7 @@ unxlngx6 SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP% SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP% } - common + common { *build nice %PERL% %SOLARENV%/bin/build.pl %PROFULLSWITCH% *build_client nice %PERL% %SOLARENV%/bin/build_client.pl @@ -1016,13 +977,13 @@ unxlngx6 SOLAR_JAVA TRUE ZIPDEP %PERL% %SOLARENV%/bin/zipdep.pl } - common0 + common0 { SOLAR_ENV_ROOT /so/env SOLAR_SOURCE_ROOT %DRIVE_O% SOLAR_SYSBASE_ROOT /so/env/gcc_4.2.3_linux64_libc3.4.6/glibc3.4.6 } - common1 + common1 { COMPATH %SOLAR_ENV_ROOT%$/gcc_4.2.3_linux64_libc3.4.6/ DEVROOT %SOLAR_ENV_ROOT% @@ -1043,7 +1004,7 @@ unxlngx6 USE_SYSTEM_STL YES XAU_LIBS -lXau } - common2 + common2 { ENABLE_GRAPHITE TRUE BUILD_TOOLS %SOLARROOT%/bt_linux_libc2.32/%WORK_STAMP%/bin @@ -1081,7 +1042,7 @@ unxlngx6 { FORCE2ARCHIVE TRUE } - compath + compath { COMPATH %STAR_COMPATH% } @@ -1095,7 +1056,7 @@ unxlngx6 { SOLAR_ENV_ROOT %ENV_ROOT% } - jdk14 + jdk14 { JAVA_HOME %JDK15PATH% JDKINC %JDK15PATH%/include:%JDK15PATH%/include/linux @@ -1110,7 +1071,7 @@ unxlngx6 { SOLAR_JDK14PATH %JDK_PATH% } - jdk15 + jdk15 { JAVA_HOME %JDK15PATH% JDKINC %JDK15PATH%/include:%JDK15PATH%/include/linux @@ -1125,11 +1086,11 @@ unxlngx6 { SOLAR_JDK15PATH %JDK_PATH% } - nativecvs + nativecvs { *cvs %STAR_NATIVECVS% } - ojdk16 + ojdk16 { JAVA_HOME %OJDK16PATH% JDKINC %OJDK16PATH%/include:%OJDK16PATH%/include/linux @@ -1144,14 +1105,14 @@ unxlngx6 { SOLAR_OJDK16PATH %JDK_PATH% } - pre + pre { ILIB %PRE%/lib:%ILIB% LIB %PRE%/lib:%LIB% SOLARINC -I. -I%PRE%/inc %SOLARINC% SOLARLIB -L%PRE%/lib %SOLARLIB% -L/usr/X11R6/lib } - pro + pro { PROSWITCH -DPRODUCT } @@ -1169,39 +1130,39 @@ unxlngx6 { SOLAR_STLPATH %SOLARVERSION%$/%INPATH%$/inc%UPDMINOREXT%$/stl } - sysbaseroot + sysbaseroot { SOLAR_SYSBASE_ROOT %SYSBASE_ROOT% } } - extern + extern { - DIST_ROOT - ENV_ROOT - HOME - JDK_PATH - LOCALINI - SOL_TMP - SOURCE_ROOT - STL_ROOT - SYSBASE_ROOT - USER + DIST_ROOT + ENV_ROOT + HOME + JDK_PATH + LOCALINI + SOL_TMP + SOURCE_ROOT + STL_ROOT + SYSBASE_ROOT + USER } - order common0 bs_sourceroot envroot:0 sourceroot:0 sysbaseroot common1 jdk14path:0 jdk15path:0 ojdk16path:0 distroot:0 nativecvs ca cap cax compath common2 common3:0 pro stl:0 stl:1 common jdk14 jdk15 ojdk16 pre - reset + order common0 bs_sourceroot envroot:0 sourceroot:0 sysbaseroot common1 jdk14path:0 jdk15path:0 ojdk16path:0 distroot:0 nativecvs cap cax compath common2 common3:0 pro stl:0 stl:1 common jdk14 jdk15 ojdk16 pre + reset { - CLASSPATH - COPYALL + CLASSPATH + COPYALL } - restore + restore { - INCLUDE + INCLUDE } - script + script { - csh + csh { - 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE + 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pj all $ZIPSOURCE $BTARGET $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE 600: umask 002 800: rehash 850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR @@ -1209,10 +1170,10 @@ unxlngx6 900: if ( "$?SO_GEN_ERROR" == 1 ) echo $SO_GEN_ERROR 901: if ( "$?SO_GEN_ERROR2" == 1 ) echo $SO_GEN_ERROR2 } - sh + sh { 400: if [ $COPYALL ]; then - 410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE + 410: $SOLAR_ENV_ROOT/etools/lucopy.pj all $ZIPSOURCE $BTARGET $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE 415: fi 600: umask 002 800: hash -r @@ -1230,54 +1191,42 @@ unxlngx6 882: fi } } - switches + switches { bs_sourceroot SOURCE_ROOT_TMP - bsclient - ca - cap - cax + bsclient + cap + cax compath STAR_COMPATH - debug - distroot - envroot - jdk14 - jdk14path - jdk15 - jdk15path + debug + distroot + envroot + jdk14 + jdk14path + jdk15 + jdk15path l10n L10N_framework nativecvs STAR_NATIVECVS - ojdk16 - ojdk16path + ojdk16 + ojdk16path pre PRE - pro - sourceroot - stl - sysbaseroot + pro + sourceroot + stl + sysbaseroot } } -unxmacxi +unxmacxi { - environment + environment { - bs_sourceroot + bs_sourceroot { SOLAR_SOURCE_ROOT %SOURCE_ROOT_TMP% SOURCE_ROOT %SOURCE_ROOT_TMP% SOURCE_ROOT_USED TRUE } - ca - { - COPYALL TRUE - DEVROOT %SOL_TMP%$/r - PCLEAN_PATH %SOLARROOT%/etools - PERL %SOL_TMP%$/r$/bt_macosx_intel$/%WORK_STAMP%$/bin$/perl - SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv - SOLARROOT %SOL_TMP%$/r - SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP% - SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP% - } - cap + cap { COPYALL TRUE COPY_PACKED TRUE @@ -1290,7 +1239,7 @@ unxmacxi SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP% SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP% } - cax + cax { COPYALL FALSE DEVROOT %SOL_TMP%$/r @@ -1302,7 +1251,7 @@ unxmacxi SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP% SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP% } - common + common { *build nice %PERL% %SOLARENV%/bin/build.pl %PROFULLSWITCH% *build_client nice %PERL% %SOLARENV%/bin/build_client.pl @@ -1324,7 +1273,7 @@ unxmacxi SOLAR_JAVA TRUE ZIPDEP %PERL% %SOLARENV%/bin/zipdep.pl } - common0 + common0 { GXX_INCLUDE_PATH /so/env/gcc_4.0.1_macosx/usr/include/c++/4.0.0 SOLAR_ENV_ROOT /so/env @@ -1332,7 +1281,7 @@ unxmacxi SOLAR_SYSBASE_ROOT /so/env/gcc_4.0.1_macosx MACDEVSDK /so/env/gcc_4.0.1_macosx/MacOSX10.4u.sdk } - common1 + common1 { BUILD_OS_APPLEOSX TRUE BUILD_OS_MAJOR 10 @@ -1375,7 +1324,7 @@ unxmacxi BUILD_PIXMAN YES WITH_MOZILLA YES } - common2 + common2 { BUILD_TOOLS %SOLARROOT%/bt_macosx_intel/%WORK_STAMP%/bin COM GCC @@ -1402,7 +1351,7 @@ unxmacxi TEMP /tmp TMP /tmp } - compath + compath { COMPATH %STAR_COMPATH% } @@ -1416,7 +1365,7 @@ unxmacxi { SOLAR_ENV_ROOT %ENV_ROOT% } - jdk13 + jdk13 { JAVA_HOME %JDK13PATH% JDKINC %JDK13PATH%/include:%JDK13PATH%/include/linux @@ -1431,7 +1380,7 @@ unxmacxi { SOLAR_JDK13PATH %JDK_PATH% } - jdk14 + jdk14 { JAVA_HOME %JDK15PATH% JDKINC %JDK15PATH%/include:%JDK15PATH%/include/linux @@ -1446,7 +1395,7 @@ unxmacxi { SOLAR_JDK14PATH %JDK_PATH% } - jdk15 + jdk15 { JAVA_HOME %JDK15PATH% JDKINC %JDK15PATH%/include:%JDK15PATH%/include/linux @@ -1461,18 +1410,18 @@ unxmacxi { SOLAR_JDK15PATH %JDK_PATH% } - nativecvs + nativecvs { *cvs %STAR_NATIVECVS% } - pre + pre { ILIB %PRE%/lib:%ILIB% LIB %PRE%/lib:%LIB% SOLARINC -I. -I%PRE%/inc %SOLARINC% SOLARLIB -L%PRE%/lib %SOLARLIB% -L/usr/X11R6/lib } - pro + pro { PROSWITCH -DPRODUCT } @@ -1490,39 +1439,39 @@ unxmacxi { SOLAR_STLPATH %SOLARVERSION%$/%INPATH%$/inc%UPDMINOREXT%$/stl } - sysbaseroot + sysbaseroot { SOLAR_SYSBASE_ROOT %SYSBASE_ROOT% } } - extern + extern { - DIST_ROOT - ENV_ROOT - HOME - JDK_PATH - LOCALINI - SOL_TMP - SOURCE_ROOT - STL_ROOT - SYSBASE_ROOT - USER + DIST_ROOT + ENV_ROOT + HOME + JDK_PATH + LOCALINI + SOL_TMP + SOURCE_ROOT + STL_ROOT + SYSBASE_ROOT + USER } - order common0 bs_sourceroot envroot:0 sourceroot:0 sysbaseroot common1 jdk13path:0 jdk14path:0 jdk15path:0 distroot:0 nativecvs ca cap cax compath common2 pro stl:0 stl:1 common jdk13 jdk14 jdk15 pre - reset + order common0 bs_sourceroot envroot:0 sourceroot:0 sysbaseroot common1 jdk13path:0 jdk14path:0 jdk15path:0 distroot:0 nativecvs cap cax compath common2 pro stl:0 stl:1 common jdk13 jdk14 jdk15 pre + reset { - CLASSPATH - COPYALL + CLASSPATH + COPYALL } - restore + restore { - INCLUDE + INCLUDE } - script + script { - csh + csh { - 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE + 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pj all $ZIPSOURCE $BTARGET $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE 600: umask 002 800: rehash 850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR @@ -1530,10 +1479,10 @@ unxmacxi 900: if ( "$?SO_GEN_ERROR" == 1 ) echo $SO_GEN_ERROR 901: if ( "$?SO_GEN_ERROR2" == 1 ) echo $SO_GEN_ERROR2 } - sh + sh { 400: if [ $COPYALL ]; then - 410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE + 410: $SOLAR_ENV_ROOT/etools/lucopy.pj all $ZIPSOURCE $BTARGET $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE 415: fi 600: umask 002 800: hash -r @@ -1551,54 +1500,42 @@ unxmacxi 882: fi } } - switches + switches { bs_sourceroot SOURCE_ROOT_TMP - bsclient - ca - cap - cax + bsclient + cap + cax compath STAR_COMPATH - debug - distroot - envroot - jdk13 - jdk13path - jdk14 - jdk14path - jdk15 - jdk15path + debug + distroot + envroot + jdk13 + jdk13path + jdk14 + jdk14path + jdk15 + jdk15path l10n L10N_framework nativecvs STAR_NATIVECVS pre PRE - pro - sourceroot - stl - sysbaseroot + pro + sourceroot + stl + sysbaseroot } } -unxsoli4 +unxsoli4 { - environment + environment { - bs_sourceroot + bs_sourceroot { SOLAR_SOURCE_ROOT %SOURCE_ROOT_TMP% SOURCE_ROOT %SOURCE_ROOT_TMP% SOURCE_ROOT_USED TRUE } - ca - { - COPYALL TRUE - DEVROOT %SOL_TMP%$/r - PCLEAN_PATH %SOLARROOT%/etools - PERL %SOL_TMP%$/r$/bt_solaris_intel$/bin$/perl - SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv - SOLARROOT %SOL_TMP%$/r - SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP% - SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP% - } - cap + cap { COPYALL TRUE COPY_PACKED TRUE @@ -1611,7 +1548,7 @@ unxsoli4 SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP% SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP% } - cax + cax { COPYALL FALSE DEVROOT %SOL_TMP%$/r @@ -1623,7 +1560,7 @@ unxsoli4 SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP% SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP% } - common + common { *build nice %PERL% %SOLARENV%/bin/build.pl %PROFULLSWITCH% *build_client nice %PERL% %SOLARENV%/bin/build_client.pl @@ -1644,13 +1581,13 @@ unxsoli4 ZIPDEP %PERL% %SOLARENV%/bin/zipdep.pl __cdpath %DRIVE_O%/%WORK_STAMP%/ooo%UPDMINOREXT% } - common0 + common0 { SOLAR_ENV_ROOT /so/env SOLAR_SOURCE_ROOT %DRIVE_O% SOLAR_SYSBASE_ROOT /so/env/solaris_2.10_intel } - common1 + common1 { COMPATH /so/env/compilers/SUNWS12_p/intel/SUNWspro DEVROOT %SOLAR_ENV_ROOT% @@ -1670,7 +1607,7 @@ unxsoli4 SO_PACK %SOLAR_ENV_ROOT%/pack/%WORK_STAMP% SRC_ROOT %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT% } - common2 + common2 { BUILD_TOOLS %SOLARROOT%/bt_solaris_intel/%WORK_STAMP%/bin COM C52 @@ -1698,7 +1635,7 @@ unxsoli4 TEMP /var/tmp TMP /var/tmp } - compath + compath { COMPATH %STAR_COMPATH% } @@ -1712,7 +1649,7 @@ unxsoli4 { SOLAR_ENV_ROOT %ENV_ROOT% } - jdk13 + jdk13 { JAVA_HOME %JDK13PATH% JDKINC %JDK13PATH%/include:%JDK13PATH%/include/solaris @@ -1727,7 +1664,7 @@ unxsoli4 { SOLAR_JDK13PATH %JDK_PATH% } - jdk14 + jdk14 { JAVA_HOME %JDK14PATH% JDKINC %JDK14PATH%/include:%JDK14PATH%/include/solaris @@ -1742,7 +1679,7 @@ unxsoli4 { SOLAR_JDK14PATH %JDK_PATH% } - jdk15 + jdk15 { JAVA_HOME %JDK15PATH% JDKINC %JDK15PATH%/include:%JDK15PATH%/include/solaris @@ -1757,11 +1694,11 @@ unxsoli4 { SOLAR_JDK15PATH %JDK_PATH% } - nativecvs + nativecvs { *cvs %STAR_NATIVECVS% } - ojdk16 + ojdk16 { JAVA_HOME %OJDK16PATH% JDKINC %OJDK16PATH%/include:%OJDK16PATH%/include/solaris @@ -1776,13 +1713,13 @@ unxsoli4 { SOLAR_OJDK16PATH %JDK_PATH% } - pre + pre { ILIB %PRE%/lib:%ILIB% SOLARINC -I. -I%PRE%/inc %SOLARINC% SOLARLIB -L%PRE%/lib %SOLARLIB% } - pro + pro { PROSWITCH -DPRODUCT } @@ -1800,34 +1737,34 @@ unxsoli4 { SOLAR_STLPATH %SOLARVERSION%$/%INPATH%$/inc%UPDMINOREXT%$/stl } - sysbaseroot + sysbaseroot { SOLAR_SYSBASE_ROOT %SYSBASE_ROOT% } } - extern + extern { - DIST_ROOT - ENV_ROOT - HOME - JDK_PATH - LOCALINI - SOL_TMP - SOURCE_ROOT - STL_ROOT - SYSBASE_ROOT - USER + DIST_ROOT + ENV_ROOT + HOME + JDK_PATH + LOCALINI + SOL_TMP + SOURCE_ROOT + STL_ROOT + SYSBASE_ROOT + USER } - order common0 bs_sourceroot envroot:0 sourceroot:0 common1 distroot:0 jdk13path:0 jdk14path:0 jdk15path:0 ojdk16path:0 sysbaseroot ca cap cax compath nativecvs common2 pro stl:1 stl:0 common jdk13 jdk14 jdk15 ojdk16 pre - reset + order common0 bs_sourceroot envroot:0 sourceroot:0 common1 distroot:0 jdk13path:0 jdk14path:0 jdk15path:0 ojdk16path:0 sysbaseroot cap cax compath nativecvs common2 pro stl:1 stl:0 common jdk13 jdk14 jdk15 ojdk16 pre + reset { - CLASSPATH + CLASSPATH } - script + script { - csh + csh { - 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE + 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pj all $ZIPSOURCE $BTARGET $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE 600: umask 002 800: rehash 850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR @@ -1835,10 +1772,10 @@ unxsoli4 900: if ( "$?SO_GEN_ERROR" == 1 ) echo $SO_GEN_ERROR 901: if ( "$?SO_GEN_ERROR2" == 1 ) echo $SO_GEN_ERROR2 } - sh + sh { 400: if [ $COPYALL ]; then - 410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE + 410: $SOLAR_ENV_ROOT/etools/lucopy.pj all $ZIPSOURCE $BTARGET $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE 415: fi 600: umask 002 800: hash -r @@ -1856,55 +1793,43 @@ unxsoli4 882: fi } } - switches + switches { bs_sourceroot SOURCE_ROOT_TMP - bsclient - ca - cap - cax + bsclient + cap + cax compath STAR_COMPATH - distroot - envroot - jdk13 - jdk13path - jdk14 - jdk14path - jdk15 - jdk15path + distroot + envroot + jdk13 + jdk13path + jdk14 + jdk14path + jdk15 + jdk15path l10n L10N_framework nativecvs STAR_NATIVECVS - ojdk16 - ojdk16path + ojdk16 + ojdk16path pre PRE - pro - sourceroot - stl - sysbaseroot + pro + sourceroot + stl + sysbaseroot } } -unxsols4 +unxsols4 { - environment + environment { - bs_sourceroot + bs_sourceroot { SOLAR_SOURCE_ROOT %SOURCE_ROOT_TMP% SOURCE_ROOT %SOURCE_ROOT_TMP% SOURCE_ROOT_USED TRUE } - ca - { - COPYALL TRUE - DEVROOT %SOL_TMP%$/r - PCLEAN_PATH %SOLARROOT%/etools - PERL %SOL_TMP%$/r$/bt_solaris_sparc$/bin$/perl - SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv - SOLARROOT %SOL_TMP%$/r - SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP% - SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP% - } - cap + cap { COPYALL TRUE COPY_PACKED TRUE @@ -1917,7 +1842,7 @@ unxsols4 SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP% SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP% } - cax + cax { COPYALL FALSE DEVROOT %SOL_TMP%$/r @@ -1929,7 +1854,7 @@ unxsols4 SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP% SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP% } - common + common { *build nice %PERL% %SOLARENV%/bin/build.pl %PROFULLSWITCH% *build_client nice %PERL% %SOLARENV%/bin/build_client.pl @@ -1950,14 +1875,14 @@ unxsols4 ZIPDEP %PERL% %SOLARENV%/bin/zipdep.pl __cdpath %DRIVE_O%/%WORK_STAMP%/ooo%UPDMINOREXT% } - common0 + common0 { SOLAR_ENV_ROOT /so/env SOLAR_LICENSE_FILE /opt/SUNWspro/license_dir/sunpro.lic,1 SOLAR_SOURCE_ROOT %DRIVE_O% SOLAR_SYSBASE_ROOT /so/env/solaris_2.10_sparc } - common1 + common1 { COMPATH /so/env/compilers/SUNWS12_p/sparc/SUNWspro DEVROOT %SOLAR_ENV_ROOT% @@ -1977,7 +1902,7 @@ unxsols4 SO_PACK %SOLAR_ENV_ROOT%/pack/%WORK_STAMP% SRC_ROOT %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT% } - common2 + common2 { BUILD_TOOLS %SOLARROOT%/bt_solaris_sparc/%WORK_STAMP%/bin COM C52 @@ -2011,7 +1936,7 @@ unxsols4 TEMP /tmp TMP /tmp } - compath + compath { COMPATH %STAR_COMPATH% } @@ -2025,7 +1950,7 @@ unxsols4 { SOLAR_ENV_ROOT %ENV_ROOT% } - jdk13 + jdk13 { JAVA_HOME %JDK13PATH% JDKINC %JDK13PATH%/include:%JDK13PATH%/include/solaris @@ -2040,7 +1965,7 @@ unxsols4 { SOLAR_JDK13PATH %JDK_PATH% } - jdk14 + jdk14 { JAVA_HOME %JDK14PATH% JDKINC %JDK14PATH%/include:%JDK14PATH%/include/solaris @@ -2055,7 +1980,7 @@ unxsols4 { SOLAR_JDK14PATH %JDK_PATH% } - jdk15 + jdk15 { JAVA_HOME %JDK15PATH% JDKINC %JDK15PATH%/include:%JDK15PATH%/include/solaris @@ -2070,11 +1995,11 @@ unxsols4 { SOLAR_JDK15PATH %JDK_PATH% } - nativecvs + nativecvs { *cvs %STAR_NATIVECVS% } - ojdk16 + ojdk16 { JAVA_HOME %OJDK16PATH% JDKINC %OJDK16PATH%/include:%OJDK16PATH%/include/solaris @@ -2089,13 +2014,13 @@ unxsols4 { SOLAR_OJDK16PATH %JDK_PATH% } - pre + pre { ILIB %PRE%/lib:%ILIB% SOLARINC -I. -I%PRE%/inc %SOLARINC% SOLARLIB -L%PRE%/lib %SOLARLIB% } - pro + pro { PROSWITCH -DPRODUCT } @@ -2113,35 +2038,35 @@ unxsols4 { SOLAR_STLPATH %SOLARVERSION%$/%INPATH%$/inc%UPDMINOREXT%$/stl } - sysbaseroot + sysbaseroot { SOLAR_SYSBASE_ROOT %SYSBASE_ROOT% } } - extern + extern { - DIST_ROOT - ENV_ROOT - HOME - JDK_PATH - LM_LICENSE_FILE - LOCALINI - SOL_TMP - SOURCE_ROOT - STL_ROOT - SYSBASE_ROOT - USER + DIST_ROOT + ENV_ROOT + HOME + JDK_PATH + LM_LICENSE_FILE + LOCALINI + SOL_TMP + SOURCE_ROOT + STL_ROOT + SYSBASE_ROOT + USER } - order common0 bs_sourceroot envroot:0 sourceroot:0 common1 distroot:0 jdk13path:0 jdk14path:0 jdk15path:0 ojdk16path:0 sysbaseroot ca cap cax compath nativecvs common2 common:3 pro stl:1 stl:0 common jdk13 jdk14 jdk15 ojdk16 pre - reset + order common0 bs_sourceroot envroot:0 sourceroot:0 common1 distroot:0 jdk13path:0 jdk14path:0 jdk15path:0 ojdk16path:0 sysbaseroot cap cax compath nativecvs common2 common:3 pro stl:1 stl:0 common jdk13 jdk14 jdk15 ojdk16 pre + reset { - CLASSPATH + CLASSPATH } - script + script { - csh + csh { - 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE + 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pj all $ZIPSOURCE $BTARGET $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE 600: umask 002 800: rehash 850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR @@ -2149,10 +2074,10 @@ unxsols4 900: if ( "$?SO_GEN_ERROR" == 1 ) echo $SO_GEN_ERROR 901: if ( "$?SO_GEN_ERROR2" == 1 ) echo $SO_GEN_ERROR2 } - sh + sh { 400: if [ $COPYALL ]; then - 410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE + 410: $SOLAR_ENV_ROOT/etools/lucopy.pj all $ZIPSOURCE $BTARGET $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE 415: fi 600: umask 002 800: hash -r @@ -2170,55 +2095,43 @@ unxsols4 882: fi } } - switches + switches { bs_sourceroot SOURCE_ROOT_TMP - bsclient - ca - cap - cax + bsclient + cap + cax compath STAR_COMPATH - distroot - envroot - jdk13 - jdk13path - jdk14 - jdk14path - jdk15 - jdk15path + distroot + envroot + jdk13 + jdk13path + jdk14 + jdk14path + jdk15 + jdk15path l10n L10N_framework nativecvs STAR_NATIVECVS - ojdk16 - ojdk16path + ojdk16 + ojdk16path pre PRE - pro - sourceroot - stl - sysbaseroot + pro + sourceroot + stl + sysbaseroot } } -unxsolu4 +unxsolu4 { - environment + environment { - bs_sourceroot + bs_sourceroot { SOLAR_SOURCE_ROOT %SOURCE_ROOT_TMP% SOURCE_ROOT %SOURCE_ROOT_TMP% SOURCE_ROOT_USED TRUE } - ca - { - COPYALL TRUE - DEVROOT %SOL_TMP%$/r - PCLEAN_PATH %SOLARROOT%/etools - PERL %SOL_TMP%$/r$/bt_solaris_sparc$/bin$/perl - SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv - SOLARROOT %SOL_TMP%$/r - SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP% - SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP% - } - cap + cap { COPYALL TRUE COPY_PACKED TRUE @@ -2231,7 +2144,7 @@ unxsolu4 SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP% SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP% } - cax + cax { COPYALL FALSE DEVROOT %SOL_TMP%$/r @@ -2243,7 +2156,7 @@ unxsolu4 SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP% SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP% } - common + common { *build nice %PERL% %SOLARENV%/bin/build.pl %PROFULLSWITCH% *build_client nice %PERL% %SOLARENV%/bin/build_client.pl @@ -2256,7 +2169,7 @@ unxsolu4 COPYPRJ %PERL% %COMMON_ENV_TOOLS%/copyprj.pl DELIVER %PERL% %SOLARENV%/bin/deliver.pl DMAKEROOT %SOLARENV%/inc/startup - ENABLE_GNOMEVFS + ENABLE_GNOMEVFS FREETYPE_CFLAGS -I%SYSBASE%/usr/sfw/include -I%SYSBASE%/usr/sfw/include/freetype2 FREETYPE_LIBS -L%SYSBASE%/usr/sfw/lib/sparcv9 -lfreetype LIBXML_CFLAGS -I%SYSBASE%/usr/include/libxml2 @@ -2274,13 +2187,13 @@ unxsolu4 ZIPDEP %PERL% %SOLARENV%/bin/zipdep.pl __cdpath %DRIVE_O%/%WORK_STAMP%/ooo%UPDMINOREXT% } - common0 + common0 { SOLAR_ENV_ROOT /so/env SOLAR_SOURCE_ROOT %DRIVE_O% SOLAR_SYSBASE_ROOT /so/env/solaris_2.10_sparc } - common1 + common1 { COMPATH /so/env/compilers/SUNWS12m1/sparc/SUNWspro DEVROOT %SOLAR_ENV_ROOT% @@ -2297,7 +2210,7 @@ unxsolu4 SRC_ROOT %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT% USE_SYSTEM_STL YES } - common2 + common2 { BUILD_TOOLS %SOLARROOT%/bt_solaris_sparc/%WORK_STAMP%/bin COM C52 @@ -2326,7 +2239,7 @@ unxsolu4 TEMP /tmp TMP /tmp } - compath + compath { COMPATH %STAR_COMPATH% } @@ -2340,7 +2253,7 @@ unxsolu4 { SOLAR_ENV_ROOT %ENV_ROOT% } - jdk15 + jdk15 { JAVA_HOME %JDK15PATH% JDKINC %JDK15PATH%/include:%JDK15PATH%/include/solaris @@ -2355,17 +2268,17 @@ unxsolu4 { SOLAR_JDK15PATH %JDK_PATH% } - nativecvs + nativecvs { *cvs %STAR_NATIVECVS% } - pre + pre { ILIB %PRE%/lib:%ILIB% SOLARINC -I. -I%PRE%/inc %SOLARINC% SOLARLIB -L%PRE%/lib %SOLARLIB% } - pro + pro { PROSWITCH -DPRODUCT } @@ -2383,35 +2296,35 @@ unxsolu4 { SOLAR_STLPATH %SOLARVERSION%$/%INPATH%$/inc%UPDMINOREXT%$/stl } - sysbaseroot + sysbaseroot { SOLAR_SYSBASE_ROOT %SYSBASE_ROOT% } } - extern + extern { - DIST_ROOT - ENV_ROOT - HOME - JDK_PATH - LM_LICENSE_FILE - LOCALINI - SOL_TMP - SOURCE_ROOT - STL_ROOT - SYSBASE_ROOT - USER + DIST_ROOT + ENV_ROOT + HOME + JDK_PATH + LM_LICENSE_FILE + LOCALINI + SOL_TMP + SOURCE_ROOT + STL_ROOT + SYSBASE_ROOT + USER } - order common0 bs_sourceroot envroot:0 sourceroot:0 common1 distroot:0 jdk15path:0 sysbaseroot ca cap cax compath nativecvs common2 common:3 pro stl:1 stl:0 common jdk15 pre - reset + order common0 bs_sourceroot envroot:0 sourceroot:0 common1 distroot:0 jdk15path:0 sysbaseroot cap cax compath nativecvs common2 common:3 pro stl:1 stl:0 common jdk15 pre + reset { - CLASSPATH + CLASSPATH } - script + script { - csh + csh { - 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE + 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pj all $ZIPSOURCE $BTARGET $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE 600: umask 002 800: rehash 850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR @@ -2419,10 +2332,10 @@ unxsolu4 900: if ( "$?SO_GEN_ERROR" == 1 ) echo $SO_GEN_ERROR 901: if ( "$?SO_GEN_ERROR2" == 1 ) echo $SO_GEN_ERROR2 } - sh + sh { 400: if [ $COPYALL ]; then - 410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE + 410: $SOLAR_ENV_ROOT/etools/lucopy.pj all $ZIPSOURCE $BTARGET $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE 415: fi 600: umask 002 800: hash -r @@ -2440,49 +2353,37 @@ unxsolu4 882: fi } } - switches + switches { bs_sourceroot SOURCE_ROOT_TMP - bsclient - ca - cap - cax + bsclient + cap + cax compath STAR_COMPATH - distroot - envroot - jdk15 - jdk15path + distroot + envroot + jdk15 + jdk15path l10n L10N_framework nativecvs STAR_NATIVECVS pre PRE - pro - sourceroot - stl - sysbaseroot + pro + sourceroot + stl + sysbaseroot } } -unxubti8 +unxubti8 { - environment + environment { - bs_sourceroot + bs_sourceroot { SOLAR_SOURCE_ROOT %SOURCE_ROOT_TMP% SOURCE_ROOT %SOURCE_ROOT_TMP% SOURCE_ROOT_USED TRUE } - ca - { - COPYALL TRUE - DEVROOT %SOL_TMP%$/r - PCLEAN_PATH %SOLARROOT%/etools - PERL %SOL_TMP%$/r$/bt_linux_libc2.11$/%WORK_STAMP%$/bin$/perl - SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv - SOLARROOT %SOL_TMP%$/r - SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP% - SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP% - } - cap + cap { COPYALL TRUE COPY_PACKED TRUE @@ -2495,7 +2396,7 @@ unxubti8 SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP% SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP% } - cax + cax { COPYALL FALSE DEVROOT %SOL_TMP%$/r @@ -2507,7 +2408,7 @@ unxubti8 SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP% SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP% } - common + common { *build nice %PERL% %SOLARENV%/bin/build.pl %PROFULLSWITCH% *build_client nice %PERL% %SOLARENV%/bin/build_client.pl @@ -2528,12 +2429,12 @@ unxubti8 SOLAR_JAVA TRUE ZIPDEP %PERL% %SOLARENV%/bin/zipdep.pl } - common0 + common0 { SOLAR_ENV_ROOT /so/env SOLAR_SOURCE_ROOT %DRIVE_O% } - common1 + common1 { AGG_VERSION 2300 ANT /usr/share/ant/bin/ant @@ -2574,7 +2475,7 @@ unxubti8 XINERAMA_LINK dynamic ZIPDEP zipdep.pl } - common2 + common2 { ENABLE_GRAPHITE TRUE BUILD_TOOLS %SOLARROOT%/bt_linux_libc2.11/%WORK_STAMP%/bin @@ -2597,11 +2498,11 @@ unxubti8 TEMP /tmp TMP /tmp } - compath + compath { COMPATH /usr/bin } - debug + debug { LD_LIBRARY_PATH %SOLARROOT%/solenv/unxlngi4/lib/debug:%LD_LIBRARY_PATH% } @@ -2614,7 +2515,7 @@ unxubti8 { SOLAR_ENV_ROOT %ENV_ROOT% } - jdk15 + jdk15 { JAVA_HOME %OJDK16PATH% JDKINC %OJDK16PATH%/include:%OJDK16PATH%/include/linux @@ -2628,11 +2529,11 @@ unxubti8 { SOLAR_JDK15PATH %JDK_PATH% } - nativecvs + nativecvs { *cvs %STAR_NATIVECVS% } - ojdk16 + ojdk16 { JAVA_HOME %OJDK16PATH% JDKINC %OJDK16PATH%/include:%OJDK16PATH%/include/linux @@ -2646,17 +2547,17 @@ unxubti8 { SOLAR_OJDK16PATH %JDK_PATH% } - pre + pre { LD_LIBRARY_PATH %PRE%/lib:%LD_LIBRARY_PATH% SOLARINC -I. -I%PRE%/inc %SOLARINC% SOLARLIB -L../lib -L%PRE%/lib %SOLARLIB% -L/usr/X11R6/lib } - pro + pro { PROSWITCH -DPRODUCT } - shell + shell { USE_SHELL STAR_USE_SHELL } @@ -2675,99 +2576,84 @@ unxubti8 SOLAR_STLPATH %SOLARVERSION%$/%INPATH%$/inc%UPDMINOREXT%$/stl } } - extern + extern { - DIST_ROOT - ENV_ROOT - HOME - JDK_PATH - LOCALINI - SOL_TMP - SOURCE_ROOT - STL_ROOT - USER + DIST_ROOT + ENV_ROOT + HOME + JDK_PATH + LOCALINI + SOL_TMP + SOURCE_ROOT + STL_ROOT + USER } - order common0 bs_sourceroot envroot:0 sourceroot:0 common1 ojdk16path:0 distroot:0 nativecvs ca cap cax compath common2 pro stl:0 stl:1 common jdk15 ojdk16 debug pre - reset + order common0 bs_sourceroot envroot:0 sourceroot:0 common1 ojdk16path:0 distroot:0 nativecvs cap cax compath common2 pro stl:0 stl:1 common jdk15 ojdk16 debug pre + reset { - CLASSPATH - COPYALL - ENABLE_CRASHDUMP + CLASSPATH + COPYALL + ENABLE_CRASHDUMP } - restore + restore { - INCLUDE + INCLUDE } - script + script { - csh + csh { - 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE + 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pj all $ZIPSOURCE $BTARGET $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE 600: umask 002 800: rehash } - sh + sh { 400: if [ $COPYALL ]; then - 410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE + 410: $SOLAR_ENV_ROOT/etools/lucopy.pj all $ZIPSOURCE $BTARGET $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE 415: fi 600: umask 002 800: hash -r 882: fi } } - switches + switches { bs_sourceroot SOURCE_ROOT_TMP - bsclient - ca - cap - cax - debug - distroot - envroot - jdk15 + bsclient + cap + cax + debug + distroot + envroot + jdk15 l10n L10N_framework nativecvs STAR_NATIVECVS - ojdk16 - ojdk16path + ojdk16 + ojdk16path pre PRE - pro - sourceroot + pro + sourceroot } } -wntgcci1 +wntgcci1 { - environment + environment { - bs_sourceroot + bs_sourceroot { SOLAR_SOURCE_ROOT %SOURCE_ROOT_TMP% SOURCE_ROOT %SOURCE_ROOT_TMP% SOURCE_ROOT_USED TRUE } - ca - { - COMPATH %SOL_TMP%$/r$/MinGW - COPYALL TRUE - DEVROOT %SOL_TMP%$/r - FSDK %SOL_TMP%$/r$/msvc7net$/FrameworkSDK - PCLEAN_PATH %SOLARROOT%$/etw - PERL %SOL_TMP%$/r$/btw$/perl$/bin$/perl - PSDK %SOL_TMP%$/r$/MinGW$/w32api - SHARED_COM_SDK_PATH %SOL_TMP%$/r$/msvc7net$/Common7$/ide - SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv - SOLARROOT %SOL_TMP%$/r - SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP% - SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP% - } - cap + cap { COMPATH %SOL_TMP%$/r$/MinGW COPYALL TRUE COPY_PACKED TRUE DEVROOT %SOL_TMP%$/r FSDK %SOL_TMP%$/r$/msvc7net$/FrameworkSDK + NSIS_PATH %SOL_TMP%$/NSIS_242_unicode PCLEAN_PATH %SOLARROOT%$/etw PERL %SOL_TMP%$/r$/btw$/perl$/bin$/perl PSDK %SOL_TMP%$/r$/MinGW$/w32api @@ -2778,11 +2664,12 @@ wntgcci1 SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP% SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP% } - cax + cax { COMPATH %SOL_TMP%$/r$/MinGW COPYALL FALSE FSDK %SOL_TMP%$/r$/msvc7net$/FrameworkSDK + NSIS_PATH %SOL_TMP%$/NSIS_242_unicode PCLEAN_PATH %SOL_TMP%$/r$/etw PERL %SOL_TMP%$/r$/btw$/perl$/bin$/perl PSDK %SOL_TMP%$/r$/MinGW$/w32api @@ -2793,7 +2680,7 @@ wntgcci1 SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP% SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP% } - common + common { *build %PERL% %SOLARENV%$/bin$/build.pl %PROFULLSWITCH% *build_client %PERL% %SOLARENV%$/bin$/build_client.pl @@ -2805,7 +2692,7 @@ wntgcci1 *r cd %SOLARROOT% *s cd %SOLARVERSION% *zipdep %PERL% %SOLARENV%$/bin$/zipdep.pl - BIG_SVX + BIG_SVX COPYPRJ %PERL% %COMMON_ENV_TOOLS%/copyprj.pl DELIVER %PERL% %SOLARENV%$/bin$/deliver.pl DMAKEROOT %SOLARENV%$/inc$/startup @@ -2822,13 +2709,13 @@ wntgcci1 XCLASSPATH . ZIPDEP %PERL% %SOLARENV%$/bin$/zipdep.pl } - common0 + common0 { SOLAR_ENV_ROOT r: SOLAR_SOURCE_ROOT o: USE_SHELL bash } - common1 + common1 { COMPATH %SOLAR_ENV_ROOT%$/MinGW # FSDK %SOLAR_ENV_ROOT%$/msvc7net$/FrameworkSDK @@ -2847,7 +2734,7 @@ wntgcci1 SO_PACK %SOLAR_ENV_ROOT%$/pack$/%WORK_STAMP% SRC_ROOT %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/ooo%UPDMINOREXT% } - common2 + common2 { ENABLE_GRAPHITE TRUE BUILD_TOOLS %SOLARROOT%$/btw$/%WORK_STAMP% @@ -2876,7 +2763,7 @@ wntgcci1 SORT sort -T %TMP% use_shl_versions TRUE } - compath + compath { COMPATH %STAR_COMPATH% } @@ -2890,7 +2777,7 @@ wntgcci1 { SOLAR_ENV_ROOT %ENV_ROOT% } - jdk13 + jdk13 { HOMEDRIVE %DEVROOT% HOMEPATH $/jdk131 @@ -2909,7 +2796,7 @@ wntgcci1 { SOLAR_JDK13PATH %JDK_PATH% } - jdk14 + jdk14 { HOMEDRIVE %DEVROOT% HOMEPATH $/jdk141 @@ -2928,7 +2815,7 @@ wntgcci1 { SOLAR_JDK14PATH %JDK_PATH% } - jdk15 + jdk15 { HOMEDRIVE %DEVROOT% HOMEPATH $/jdk151 @@ -2947,16 +2834,16 @@ wntgcci1 { SOLAR_JDK15PATH %JDK_PATH% } - pre + pre { ILIB %PRE%$/lib$:%ILIB% LIB %PRE%$/lib$:%LIB% } - psdk + psdk { PSDK %STAR_PSDK% } - shell + shell { USE_SHELL STAR_USE_SHELL } @@ -2975,32 +2862,32 @@ wntgcci1 SOLAR_STLPATH %SOLARVERSION%$/%INPATH%$/inc%UPDMINOREXT%$/stl } } - extern + extern { - COMSPEC - DIST_ROOT - ENV_ROOT - JDK_PATH - LOCALINI - SOL_TMP - SOURCE_ROOT - STL_ROOT + COMSPEC + DIST_ROOT + ENV_ROOT + JDK_PATH + LOCALINI + SOL_TMP + SOURCE_ROOT + STL_ROOT } - order common0 bs_sourceroot envroot:0 sourceroot:0 common1 distroot:0 ca cap cax psdk compath common2 jdk13path:0 jdk14path:0 jdk15path:0 stl:1 stl:0 common jdk13 jdk14 jdk15 pre - reset + order common0 bs_sourceroot envroot:0 sourceroot:0 common1 distroot:0 cap cax psdk compath common2 jdk13path:0 jdk14path:0 jdk15path:0 stl:1 stl:0 common jdk13 jdk14 jdk15 pre + reset { - COPYALL - NSIS_PATH - SOLAR_ENV_ROOT - WST + COPYALL + NSIS_PATH + SOLAR_ENV_ROOT + WST } - script + script { - csh + csh { 150: setenv MYENV_PATH $PATH 160: setenv PATH $SSX_PATH - 200: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/btw/perl/bin/perl $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE + 200: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/btw/perl/bin/perl $SOLAR_ENV_ROOT/etools/lucopy.pj all $ZIPSOURCE $BTARGET $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE 260: setenv PATH $MYENV_PATH 270: unsetenv MYENV_PATH 850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR @@ -3008,14 +2895,14 @@ wntgcci1 900: if ( "$?SO_GEN_ERROR" == 1 ) echo $SO_GEN_ERROR 901: if ( "$?SO_GEN_ERROR2" == 1 ) echo $SO_GEN_ERROR2 } - sh + sh { 150: export MYENV_PATH=$PATH 160: export PATH=$SSX_PATH 260: export PATH=$MYENV_PATH 270: unset MYENV_PATH 400: if [ $COPYALL ]; then - 410: $SOLAR_ENV_ROOT/btw/perl/bin/perl $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE + 410: $SOLAR_ENV_ROOT/btw/perl/bin/perl $SOLAR_ENV_ROOT/etools/lucopy.pj all $ZIPSOURCE $BTARGET $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE 415: fi 850: if [ "0$SO_GEN_ERROR" -eq 0 ]; then 851: export SO_GEN_ERROR @@ -3031,59 +2918,41 @@ wntgcci1 882: fi } } - switches + switches { bs_sourceroot SOURCE_ROOT_TMP - bsclient - ca - cap - cax + bsclient + cap + cax compath STAR_COMPATH - distroot - envroot - jdk13 - jdk13path - jdk14 - jdk14path - jdk15 - jdk15path + distroot + envroot + jdk13 + jdk13path + jdk14 + jdk14path + jdk15 + jdk15path l10n L10N_framework pre PRE - pro + pro psdk STAR_PSDK shell STAR_USE_SHELL - sourceroot - stl + sourceroot + stl } } -wntmsci11 +wntmsci11 { - environment + environment { - bs_sourceroot + bs_sourceroot { SOLAR_SOURCE_ROOT %SOURCE_ROOT_TMP% SOURCE_ROOT %SOURCE_ROOT_TMP% SOURCE_ROOT_USED TRUE } - ca - { - COMPATH %SOL_TMP%$/r$/msvc8p - COMPROOT %SOL_TMP%$/r$/msvc8p - COPYALL TRUE - DEVROOT %SOL_TMP%$/r - DSDK %SOL_TMP%$/r$/msvc8p$/DirectXSDK - FSDK %SOL_TMP%$/r$/msvc8p$/Sdk$/v2.0 - PCLEAN_PATH %SOLARROOT%$/etw - PERL %SOL_TMP%$/r$/btw$/perl$/bin$/perl - PSDK %SOL_TMP%$/r$/msvc8p$/PlatformSDK - SHARED_COM_SDK_PATH %SOL_TMP%$/r$/msvc8p$/Common7$/ide - SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv - SOLARROOT %SOL_TMP%$/r - SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP% - SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP% - } - cap + cap { COMPATH %SOL_TMP%$/r$/msvc8p COMPROOT %SOL_TMP%$/r$/msvc8p @@ -3102,7 +2971,7 @@ wntmsci11 SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP% SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP% } - cax + cax { COMPATH %SOL_TMP%$/r$/msvc8p COMPROOT %SOL_TMP%$/r$/msvc8p @@ -3119,7 +2988,7 @@ wntmsci11 SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP% SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP% } - common + common { *build %PERL% %SOLARENV%$/bin$/build.pl %PROFULLSWITCH% *build_client %PERL% %SOLARENV%$/bin$/build_client.pl @@ -3131,7 +3000,7 @@ wntmsci11 *r cdd %SOLARROOT% *s cdd %SOLARVERSION% *zipdep %PERL% %SOLARENV%$/bin$/zipdep.pl - BIG_SVX + BIG_SVX BISON_PKGDATADIR %BUILD_TOOLS%$/share$/bison COPYPRJ %PERL% %COMMON_ENV_TOOLS%/copyprj.pl DELIVER %PERL% %SOLARENV%$/bin$/deliver.pl @@ -3154,14 +3023,14 @@ wntmsci11 XCLASSPATH . ZIPDEP %PERL% %SOLARENV%$/bin$/zipdep.pl } - common0 + common0 { BS_ROOT n: SOLAR_ENV_ROOT r: SOLAR_SOURCE_ROOT o: USE_SHELL 4nt } - common1 + common1 { COMPATH %SOLAR_ENV_ROOT%$/msvc8p COMPROOT %SOLAR_ENV_ROOT%$/msvc8p @@ -3180,7 +3049,7 @@ wntmsci11 SO_PACK %SOLAR_ENV_ROOT%$/pack$/%WORK_STAMP% SRC_ROOT %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/ooo%UPDMINOREXT% } - common2 + common2 { ENABLE_GRAPHITE TRUE BUILD_TOOLS %SOLARROOT%$/btw$/%WORK_STAMP% @@ -3212,7 +3081,7 @@ wntmsci11 SORT sort -T %TMP% use_shl_versions TRUE } - compath + compath { COMPATH %STAR_COMPATH% } @@ -3226,7 +3095,7 @@ wntmsci11 { SOLAR_ENV_ROOT %ENV_ROOT% } - jdk13 + jdk13 { HOMEDRIVE %DEVROOT% HOMEPATH $/jdk131 @@ -3245,7 +3114,7 @@ wntmsci11 { SOLAR_JDK13PATH %JDK_PATH% } - jdk14 + jdk14 { HOMEDRIVE %DEVROOT% HOMEPATH $/jdk141 @@ -3264,7 +3133,7 @@ wntmsci11 { SOLAR_JDK14PATH %JDK_PATH% } - jdk15 + jdk15 { HOMEDRIVE %DEVROOT% HOMEPATH $/jdk151 @@ -3283,16 +3152,16 @@ wntmsci11 { SOLAR_JDK15PATH %JDK_PATH% } - pre + pre { ILIB %PRE%$/lib$:%ILIB% LIB %PRE%$/lib$:%LIB% } - psdk + psdk { PSDK %STAR_PSDK% } - shell + shell { use_shell STAR_USE_SHELL } @@ -3311,95 +3180,72 @@ wntmsci11 SOLAR_STLPATH %SOLARVERSION%$/%INPATH%$/inc%UPDMINOREXT%$/stl } } - extern + extern { - COMSPEC - DIST_ROOT - ENV_ROOT - JDK_PATH - LOCALINI - SOL_TMP - SOURCE_ROOT - STL_ROOT + COMSPEC + DIST_ROOT + ENV_ROOT + JDK_PATH + LOCALINI + SOL_TMP + SOURCE_ROOT + STL_ROOT } - order common0 bs_sourceroot envroot:0 sourceroot:0 common1 distroot:0 ca cap cax psdk compath common2 jdk13path:0 jdk14path:0 jdk15path:0 stl:1 stl:0 common jdk13 jdk14 jdk15 pre - reset + order common0 bs_sourceroot envroot:0 sourceroot:0 common1 distroot:0 cap cax psdk compath common2 jdk13path:0 jdk14path:0 jdk15path:0 stl:1 stl:0 common jdk13 jdk14 jdk15 pre + reset { - COPYALL - SOLAR_ENV_ROOT - WST + COPYALL + SOLAR_ENV_ROOT + WST } - script + script { - post + post { 150: set MYENV_PATH=%PATH 160: set PATH=%SSX_PATH - 200: if "%COPYALL%"=="TRUE" %SOLAR_ENV_ROOT%\btw\perl\bin\perl %SOLAR_ENV_ROOT%\etools\lucopy.pl -all %ZIPSOURCE% %BTARGET% $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE + 200: if "%COPYALL%"=="TRUE" %SOLAR_ENV_ROOT%\btw\perl\bin\perl %SOLAR_ENV_ROOT%\etools\lucopy.pj -all %ZIPSOURCE% %BTARGET% $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE 260: set PATH=%MYENV_PATH 270: unset MYENV_PATH 400: if "%SO_GEN_ERROR%" NE "" @echo %SO_GEN_ERROR% 401: if "%SO_GEN_ERROR2%" NE "" echo %SO_GEN_ERROR2% } } - switches + switches { bs_sourceroot SOURCE_ROOT_TMP - bsclient - ca - cap - cax + bsclient + cap + cax compath STAR_COMPATH - distroot - envroot - jdk13 - jdk13path - jdk14 - jdk14path - jdk15 - jdk15path + distroot + envroot + jdk13 + jdk13path + jdk14 + jdk14path + jdk15 + jdk15path l10n L10N_framework pre PRE - pro + pro psdk STAR_PSDK shell STAR_USE_SHELL - sourceroot - stl + sourceroot + stl } } -wntmsci12 +wntmsci12 { - environment + environment { - bs_sourceroot + bs_sourceroot { SOLAR_SOURCE_ROOT $dp(%SOURCE_ROOT_TMP%) SOURCE_ROOT $dp(%SOURCE_ROOT_TMP%) SOURCE_ROOT_USED TRUE } - ca - { - BUILD_TOOLS %SOL_TMP%$/btw$/%BTOOLDIR% - COMPATH %SOL_TMP%$/r$/msvc9p - COMPROOT %SOL_TMP%$/r$/msvc9p - COPYALL TRUE - DEVROOT %SOL_TMP%$/r - DSDK %SOL_TMP%$/r$/msvc9p$/DirectXSDK - ENV_TOOLS %SOL_TMP%$/etw$/%WORK_STAMP% - FSDK %SOL_TMP%$/r$/msvc9p$/Sdk$/v3.5 - F20SDK %SOL_TMP%$/r$/msvc9p$/Sdk$/v2.0 - PCLEAN_PATH %SOLARROOT%$/etw - PERL %SOL_TMP%$/r$/%PERLDIR% - PSDK %SOL_TMP%$/r$/msvc9p$/PlatformSDK$/V6.1 - SHARED_COM_SDK_PATH %SOL_TMP%$/r$/msvc9p$/Common7$/IDE - SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv - SOLARROOT %SOL_TMP%$/r - SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP% - SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP% -# TOUCH %SOL_TMP%$/r$/btw$/%BTOOLDIR%$/touch.exe - - } - cap + cap { BUILD_TOOLS %SOL_TMP%$/btw$/%BTOOLDIR% COMPATH %SOL_TMP%$/r$/msvc9p @@ -3411,6 +3257,7 @@ wntmsci12 ENV_TOOLS %SOL_TMP%$/etw$/%WORK_STAMP% FSDK %SOL_TMP%$/r$/msvc9p$/Sdk$/v3.5 F20SDK %SOL_TMP%$/r$/msvc9p$/Sdk$/v2.0 + NSIS_PATH %SOL_TMP%$/NSIS_242_unicode PCLEAN_PATH %SOLARROOT%$/etw PERL %SOL_TMP%$/r$/%PERLDIR% PSDK %SOL_TMP%$/r$/msvc9p$/PlatformSDK$/V6.1 @@ -3423,7 +3270,7 @@ wntmsci12 # TOUCH %SOL_TMP%$/r$/btw$/%BTOOLDIR%$/touch.exe } - cax + cax { BUILD_TOOLS %SOL_TMP%$/btw$/%BTOOLDIR% COMPATH %SOL_TMP%$/r$/msvc9p @@ -3433,6 +3280,7 @@ wntmsci12 ENV_TOOLS %SOL_TMP%$/etw$/%WORK_STAMP% FSDK %COMPATH%$/Sdk$/v3.5 F20SDK %SOL_TMP%$/r$/msvc9p$/Sdk$/v2.0 + NSIS_PATH %SOL_TMP%$/NSIS_242_unicode PCLEAN_PATH %SOL_TMP%$/r$/etw PERL %SOL_TMP%$/r$/%PERLDIR% PSDK %COMPATH%$/PlatformSDK$/V6.1 @@ -3444,7 +3292,7 @@ wntmsci12 SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP% # TOUCH %SOL_TMP%$/r$/btw$/%BTOOLDIR%$/touch.exe } - common + common { *build %PERL% %SOLARENV%$/bin$/build.pl %PROFULLSWITCH% *build_client %PERL% %SOLARENV%$/bin$/build_client.pl @@ -3457,7 +3305,7 @@ wntmsci12 *s cd %SOLARVERSION% *zipdep %PERL% %SOLARENV%$/bin$/zipdep.pl *z_ooo %PERL% %SOLARENV%$/bin$/z_ooo.pl - BIG_SVX + BIG_SVX BISON_PKGDATADIR %BUILD_TOOLS%$/share$/bison COPYPRJ %PERL% %COMMON_ENV_TOOLS%$/copyprj.pl CXX_X64_BINARY %COMPROOT%$/bin$/x86_amd64$/cl.exe @@ -3501,7 +3349,7 @@ wntmsci12 { PERL perl } - common1 + common1 { COMPATH %SOLAR_ENV_ROOT%$/msvc9p COMPROOT %SOLAR_ENV_ROOT%$/msvc9p @@ -3524,7 +3372,7 @@ wntmsci12 # TEMP $dp(%TEMP%) # TMP $dp(%TMP%) } - common2 + common2 { ENABLE_GRAPHITE TRUE BUILD_TOOLS %SOLARROOT%$/btw$/%BTOOLDIR% @@ -3563,7 +3411,7 @@ wntmsci12 { SHIPDRIVE %BS_ROOT%$/ship$/install } - compath + compath { COMPATH $dp(%STAR_COMPATH%) } @@ -3577,7 +3425,7 @@ wntmsci12 { SOLAR_ENV_ROOT $dp(%ENV_ROOT%) } - jdk13 + jdk13 { # HOMEDRIVE %DEVROOT% # HOMEPATH $/jdk131 @@ -3596,7 +3444,7 @@ wntmsci12 { SOLAR_JDK13PATH $dp(%JDK_PATH%) } - jdk14 + jdk14 { # HOMEDRIVE %DEVROOT% # HOMEPATH $/jdk141 @@ -3615,7 +3463,7 @@ wntmsci12 { SOLAR_JDK14PATH $dp(%JDK_PATH%) } - jdk15 + jdk15 { # HOMEDRIVE %DEVROOT% # HOMEPATH $/jdk151 @@ -3634,11 +3482,11 @@ wntmsci12 { SOLAR_JDK15PATH $dp(%JDK_PATH%) } - nojava + nojava { DISABLE_JAVA TRUE } - ojdk16 + ojdk16 { # HOMEDRIVE %DEVROOT% # HOMEPATH $/openjdk-6-b08-windows-i586 @@ -3656,16 +3504,16 @@ wntmsci12 { SOLAR_OJDK16PATH $dp(%JDK_PATH%) } - pre + pre { ILIB %PRE%$/lib;%ILIB% LIB %PRE%$/lib;%LIB% } - pro + pro { RES_ENUS TRUE } - psdk + psdk { PSDK $dp(%STAR_PSDK%) } @@ -3683,50 +3531,50 @@ wntmsci12 { SOLAR_STLPATH %SOLARVERSION%$/%INPATH%$/inc%UPDMINOREXT%$/stl } - tmp + tmp { SOL_TMP $dp(%SOL_TMP_DIR%) } } - extern + extern { - COMSPEC - DIST_ROOT - ENV_ROOT - JDK_PATH - LOCALINI + COMSPEC + DIST_ROOT + ENV_ROOT + JDK_PATH + LOCALINI OSTYPE - $dp(SOL_TMP) - $dp(SOURCE_ROOT) - $dp(STL_ROOT) + $dp(SOL_TMP) + $dp(SOURCE_ROOT) + $dp(STL_ROOT) $dp(TMP) $dp(TEMP) } - order nojava common0 bs_sourceroot tmp envroot:0 sourceroot:0 pro common1 distroot:0 ca cap cax common02 psdk compath common2 common:3 jdk13path:0 jdk14path:0 jdk15path:0 ojdk16path:0 stl:1 stl:0 common jdk13 jdk14 jdk15 ojdk16 pre - reset - { - COPYALL - CXX_X64_BINARY - DB2IMP - GCRINC - GCRLIB - GCRPATH - LIBMGR_X64_BINARY - LINK_X64_BINARY - NSIS_PATH - OLD_CHAOS + order nojava common0 bs_sourceroot tmp envroot:0 sourceroot:0 pro common1 distroot:0 cap cax common02 psdk compath common2 common:3 jdk13path:0 jdk14path:0 jdk15path:0 ojdk16path:0 stl:1 stl:0 common jdk13 jdk14 jdk15 ojdk16 pre + reset + { + COPYALL + CXX_X64_BINARY + DB2IMP + GCRINC + GCRLIB + GCRPATH + LIBMGR_X64_BINARY + LINK_X64_BINARY + NSIS_PATH + OLD_CHAOS PERLDIR - SOLAR_ENV_ROOT - TFDEF - TFDIR - WST + SOLAR_ENV_ROOT + TFDEF + TFDIR + WST } - script + script { sh { 400: if [ $COPYALL ]; then - 410: perl $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE + 410: perl $SOLAR_ENV_ROOT/etools/lucopy.pj all $ZIPSOURCE $BTARGET $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE 415: fi 600: umask 002 800: hash -r @@ -3744,68 +3592,45 @@ wntmsci12 882: fi } } - switches + switches { bs_sourceroot SOURCE_ROOT_TMP - bsclient - ca - cap - cax + bsclient + cap + cax compath STAR_COMPATH - distroot - envroot - jdk13 - jdk13path - jdk14 - jdk14path - jdk15 - jdk15path + distroot + envroot + jdk13 + jdk13path + jdk14 + jdk14path + jdk15 + jdk15path l10n L10N_framework - nojava - ojdk16 - ojdk16path + nojava + ojdk16 + ojdk16path pre PRE - pro + pro psdk STAR_PSDK shell STAR_USE_SHELL - sourceroot - stl + sourceroot + stl tmp SOL_TMP_DIR } } -wntmsci13 +wntmsci13 { - environment + environment { - bs_sourceroot + bs_sourceroot { SOLAR_SOURCE_ROOT $dp(%SOURCE_ROOT_TMP%) SOURCE_ROOT $dp(%SOURCE_ROOT_TMP%) SOURCE_ROOT_USED TRUE } - ca - { - BUILD_TOOLS %SOL_TMP%$/btw$/%BTOOLDIR% - COMPATH %SOL_TMP%$/r$/msvc9p - COMPROOT %SOL_TMP%$/r$/msvc9p - COPYALL TRUE - DEVROOT %SOL_TMP%$/r - DSDK %SOL_TMP%$/r$/msvc9p$/DirectXSDK - ENV_TOOLS %SOL_TMP%$/etw$/%WORK_STAMP% - FSDK %SOL_TMP%$/r$/msvc9p$/Sdk$/v3.5 - F20SDK %SOL_TMP%$/r$/msvc9p$/Sdk$/v2.0 - PCLEAN_PATH %SOLARROOT%$/etw - PERL %SOL_TMP%$/r$/%PERLDIR% - PSDK %SOL_TMP%$/r$/msvc9p$/PlatformSDK$/V6.1 - SHARED_COM_SDK_PATH %SOL_TMP%$/r$/msvc9p$/Common7$/IDE - SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv - SOLARROOT %SOL_TMP%$/r - SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP% - SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP% -# TOUCH %SOL_TMP%$/r$/btw$/%BTOOLDIR%$/touch.exe - - } - cap + cap { BUILD_TOOLS %SOL_TMP%$/btw$/%BTOOLDIR% COMPATH %SOL_TMP%$/r$/msvc9p @@ -3817,6 +3642,7 @@ wntmsci13 ENV_TOOLS %SOL_TMP%$/etw$/%WORK_STAMP% FSDK %SOL_TMP%$/r$/msvc9p$/Sdk$/v3.5 F20SDK %SOL_TMP%$/r$/msvc9p$/Sdk$/v2.0 + NSIS_PATH %SOL_TMP%$/NSIS_242_unicode PCLEAN_PATH %SOLARROOT%$/etw PERL %SOL_TMP%$/r$/%PERLDIR% PSDK %SOL_TMP%$/r$/msvc9p$/PlatformSDK$/V6.1 @@ -3829,7 +3655,7 @@ wntmsci13 # TOUCH %SOL_TMP%$/r$/btw$/%BTOOLDIR%$/touch.exe } - cax + cax { BUILD_TOOLS %SOL_TMP%$/btw$/%BTOOLDIR% COMPATH %SOL_TMP%$/r$/msvc9p @@ -3839,6 +3665,7 @@ wntmsci13 ENV_TOOLS %SOL_TMP%$/etw$/%WORK_STAMP% FSDK %COMPATH%$/Sdk$/v3.5 F20SDK %SOL_TMP%$/r$/msvc9p$/Sdk$/v2.0 + NSIS_PATH %SOL_TMP%$/NSIS_242_unicode PCLEAN_PATH %SOL_TMP%$/r$/etw PERL %SOL_TMP%$/r$/%PERLDIR% PSDK %COMPATH%$/PlatformSDK$/V6.1 @@ -3850,7 +3677,7 @@ wntmsci13 SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP% # TOUCH %SOL_TMP%$/r$/btw$/%BTOOLDIR%$/touch.exe } - common + common { *build %PERL% %SOLARENV%$/bin$/build.pl %PROFULLSWITCH% *build_client %PERL% %SOLARENV%$/bin$/build_client.pl @@ -3863,7 +3690,7 @@ wntmsci13 *s cd %SOLARVERSION% *zipdep %PERL% %SOLARENV%$/bin$/zipdep.pl *z_ooo %PERL% %SOLARENV%$/bin$/z_ooo.pl - BIG_SVX + BIG_SVX BISON_PKGDATADIR %BUILD_TOOLS%$/share$/bison COPYPRJ %PERL% %COMMON_ENV_TOOLS%$/copyprj.pl CXX_X64_BINARY %COMPROOT%$/bin$/x86_amd64$/cl.exe @@ -3907,7 +3734,7 @@ wntmsci13 { PERL perl } - common1 + common1 { COMPATH %SOLAR_ENV_ROOT%$/msvc9p COMPROOT %SOLAR_ENV_ROOT%$/msvc9p @@ -3930,7 +3757,7 @@ wntmsci13 # TEMP $dp(%TEMP%) # TMP $dp(%TMP%) } - common2 + common2 { ENABLE_GRAPHITE TRUE BUILD_TOOLS %SOLARROOT%$/btw$/%BTOOLDIR% @@ -3969,7 +3796,7 @@ wntmsci13 { SHIPDRIVE %BS_ROOT%$/ship$/install } - compath + compath { COMPATH $dp(%STAR_COMPATH%) } @@ -3983,7 +3810,7 @@ wntmsci13 { SOLAR_ENV_ROOT $dp(%ENV_ROOT%) } - jdk13 + jdk13 { # HOMEDRIVE %DEVROOT% # HOMEPATH $/jdk131 @@ -4002,7 +3829,7 @@ wntmsci13 { SOLAR_JDK13PATH $dp(%JDK_PATH%) } - jdk14 + jdk14 { # HOMEDRIVE %DEVROOT% # HOMEPATH $/jdk141 @@ -4021,7 +3848,7 @@ wntmsci13 { SOLAR_JDK14PATH $dp(%JDK_PATH%) } - jdk15 + jdk15 { # HOMEDRIVE %DEVROOT% # HOMEPATH $/jdk151 @@ -4040,11 +3867,11 @@ wntmsci13 { SOLAR_JDK15PATH $dp(%JDK_PATH%) } - nojava + nojava { DISABLE_JAVA TRUE } - ojdk16 + ojdk16 { # HOMEDRIVE %DEVROOT% # HOMEPATH $/openjdk-6-b08-windows-i586 @@ -4062,16 +3889,16 @@ wntmsci13 { SOLAR_OJDK16PATH $dp(%JDK_PATH%) } - pre + pre { ILIB %PRE%$/lib;%ILIB% LIB %PRE%$/lib;%LIB% } - pro + pro { RES_ENUS TRUE } - psdk + psdk { PSDK $dp(%STAR_PSDK%) } @@ -4089,50 +3916,50 @@ wntmsci13 { SOLAR_STLPATH %SOLARVERSION%$/%INPATH%$/inc%UPDMINOREXT%$/stl } - tmp + tmp { SOL_TMP $dp(%SOL_TMP_DIR%) } } - extern + extern { - COMSPEC - DIST_ROOT - ENV_ROOT - JDK_PATH - LOCALINI + COMSPEC + DIST_ROOT + ENV_ROOT + JDK_PATH + LOCALINI OSTYPE - $dp(SOL_TMP) - $dp(SOURCE_ROOT) - $dp(STL_ROOT) + $dp(SOL_TMP) + $dp(SOURCE_ROOT) + $dp(STL_ROOT) $dp(TMP) $dp(TEMP) } - order nojava common0 bs_sourceroot tmp envroot:0 sourceroot:0 pro common1 distroot:0 ca cap cax common02 psdk compath common2 common:3 jdk13path:0 jdk14path:0 jdk15path:0 ojdk16path:0 stl:1 stl:0 common jdk13 jdk14 jdk15 ojdk16 pre - reset - { - COPYALL - CXX_X64_BINARY - DB2IMP - GCRINC - GCRLIB - GCRPATH - LIBMGR_X64_BINARY - LINK_X64_BINARY - NSIS_PATH - OLD_CHAOS + order nojava common0 bs_sourceroot tmp envroot:0 sourceroot:0 pro common1 distroot:0 cap cax common02 psdk compath common2 common:3 jdk13path:0 jdk14path:0 jdk15path:0 ojdk16path:0 stl:1 stl:0 common jdk13 jdk14 jdk15 ojdk16 pre + reset + { + COPYALL + CXX_X64_BINARY + DB2IMP + GCRINC + GCRLIB + GCRPATH + LIBMGR_X64_BINARY + LINK_X64_BINARY + NSIS_PATH + OLD_CHAOS PERLDIR - SOLAR_ENV_ROOT - TFDEF - TFDIR - WST + SOLAR_ENV_ROOT + TFDEF + TFDIR + WST } - script + script { sh { 400: if [ $COPYALL ]; then - 410: perl $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE + 410: perl $SOLAR_ENV_ROOT/etools/lucopy.pj all $ZIPSOURCE $BTARGET $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE 415: fi 600: umask 002 800: hash -r @@ -4150,32 +3977,31 @@ wntmsci13 882: fi } } - switches + switches { bs_sourceroot SOURCE_ROOT_TMP - bsclient - ca - cap - cax + bsclient + cap + cax compath STAR_COMPATH - distroot - envroot - jdk13 - jdk13path - jdk14 - jdk14path - jdk15 - jdk15path + distroot + envroot + jdk13 + jdk13path + jdk14 + jdk14path + jdk15 + jdk15path l10n L10N_framework - nojava - ojdk16 - ojdk16path + nojava + ojdk16 + ojdk16path pre PRE - pro + pro psdk STAR_PSDK shell STAR_USE_SHELL - sourceroot - stl + sourceroot + stl tmp SOL_TMP_DIR } } -- cgit From 167da3db7ec59e2097001cf6e1e3b16faba5bf7f Mon Sep 17 00:00:00 2001 From: Hans-Joachim Lankenau Date: Wed, 25 Nov 2009 16:09:04 +0100 Subject: ause106: #161178# remove jdk13 support --- solenv/config/sdev300.ini | 196 +++------------------------------------------- 1 file changed, 10 insertions(+), 186 deletions(-) (limited to 'solenv') diff --git a/solenv/config/sdev300.ini b/solenv/config/sdev300.ini index 23d26748848d..cdecb1c3f746 100644 --- a/solenv/config/sdev300.ini +++ b/solenv/config/sdev300.ini @@ -288,12 +288,6 @@ finish SO_GEN_ERROR2 ...resetting path to source tree SRC_ROOT UPDMINOR_not_used } - jdk13 - { - CLASSPATH .$;%JAVA_HOME%$/jre$/lib$/rt.jar - ILIB %LIB%$;%JDKLIB% - LIB %LIB%$;%JDKLIB% - } jdk14 { CLASSPATH .$;%JAVA_HOME%$/jre$/lib$/rt.jar @@ -318,7 +312,7 @@ finish LIB %LIB%$;%JDKLIB% } } - order cwsname:0 cwsname:1 cwsname:2 common_0:0 common_0:1 common_0:2 common_0:3 jdk13 jdk14 jdk15 ojdk16 common_1 common_2:0 l10n common_jre:0 common_jre:1 cax cap common_a + order cwsname:0 cwsname:1 cwsname:2 common_0:0 common_0:1 common_0:2 common_0:3 jdk14 jdk15 ojdk16 common_1 common_2:0 l10n common_jre:0 common_jre:1 cax cap common_a switches { cwsname CWS_WORK_STAMP @@ -444,21 +438,6 @@ unxfbsdi { SOLAR_ENV_ROOT %ENV_ROOT% } - jdk13 - { - JAVA_HOME %JDK13PATH% - JDKINC %JDK13PATH%/include:%JDK13PATH%/include/linux - JDKINCS -I%JDK13PATH%/include -I%JDK13PATH%/include/linux - JDKLIB %JDK13PATH%/jre/lib:%JDK13PATH%/jre/lib/i386:%JDK13PATH%/jre/lib/i386/client - JDKLIBS -L%JDK13PATH%/jre/lib -L%JDK13PATH%/jre/lib/i386 -L%JDK13PATH%/jre/lib/i386/client - JDKPATH %JDK13PATH%/bin - JDK_VERSION 131 - XCLASSPATH .:%JDK13PATH%/jre/lib/rt.jar:%JDK13PATH%/lib/tools.jar - } - jdk13path:0 IF X%JDK_PATH%X != XX - { - SOLAR_JDK13PATH %JDK_PATH% - } jdk14 { JAVA_HOME %JDK14PATH% @@ -537,7 +516,7 @@ unxfbsdi SYSBASE_ROOT USER } - order common0 bs_sourceroot envroot:0 sourceroot:0 sysbaseroot common1 jdk13path:0 jdk14path:0 jdk15path:0 distroot:0 nativecvs cap cax compath common2 pro stl:0 stl:1 common jdk13 jdk14 jdk15 debug pre + order common0 bs_sourceroot envroot:0 sourceroot:0 sysbaseroot common1 jdk14path:0 jdk15path:0 distroot:0 nativecvs cap cax compath common2 pro stl:0 stl:1 common jdk14 jdk15 debug pre reset { CLASSPATH @@ -590,8 +569,6 @@ unxfbsdi debug distroot envroot - jdk13 - jdk13path jdk14 jdk14path jdk15 @@ -741,21 +718,6 @@ unxlngi6 { SOLAR_ENV_ROOT %ENV_ROOT% } - jdk13 - { - JAVA_HOME %JDK13PATH% - JDKINC %JDK13PATH%/include:%JDK13PATH%/include/linux - JDKINCS -I%JDK13PATH%/include -I%JDK13PATH%/include/linux - JDKLIB %JDK13PATH%/jre/lib:%JDK13PATH%/jre/lib/i386:%JDK13PATH%/jre/lib/i386/client - JDKLIBS -L%JDK13PATH%/jre/lib -L%JDK13PATH%/jre/lib/i386 -L%JDK13PATH%/jre/lib/i386/client - JDKPATH %JDK13PATH%/bin - JDK_VERSION 131 - XCLASSPATH .:%JDK13PATH%/jre/lib/rt.jar:%JDK13PATH%/lib/tools.jar - } - jdk13path:0 IF X%JDK_PATH%X != XX - { - SOLAR_JDK13PATH %JDK_PATH% - } jdk14 { JAVA_HOME %JDK14PATH% @@ -848,7 +810,7 @@ unxlngi6 SYSBASE_ROOT USER } - order common0 bs_sourceroot envroot:0 sourceroot:0 sysbaseroot common1 jdk13path:0 jdk14path:0 jdk15path:0 ojdk16path:0 distroot:0 nativecvs cap cax compath common2 pro common3:0 stl:0 stl:1 common jdk13 jdk14 jdk15 ojdk16 pre + order common0 bs_sourceroot envroot:0 sourceroot:0 sysbaseroot common1 jdk14path:0 jdk15path:0 ojdk16path:0 distroot:0 nativecvs cap cax compath common2 pro common3:0 stl:0 stl:1 common jdk14 jdk15 ojdk16 pre reset { CLASSPATH @@ -901,8 +863,6 @@ unxlngi6 debug distroot envroot - jdk13 - jdk13path jdk14 jdk14path jdk15 @@ -1309,7 +1269,6 @@ unxmacxi SOLARROOT %SOLAR_ENV_ROOT% SOLARVER %SOLAR_SOURCE_ROOT%/%WORK_STAMP% SOLARVERSION %SOLAR_SOURCE_ROOT%/%WORK_STAMP% - SOLAR_JDK13PATH %SOLAR_ENV_ROOT%/mac_jdk13_unknown SOLAR_JDK14PATH %SOLAR_ENV_ROOT%/mac_jdk14_unknown SOLAR_JDK15PATH %SOLAR_ENV_ROOT%/MacOSX_JDK_1.5.0_07.intel SO_PACK %SOLAR_ENV_ROOT%/pack/%WORK_STAMP% @@ -1365,21 +1324,6 @@ unxmacxi { SOLAR_ENV_ROOT %ENV_ROOT% } - jdk13 - { - JAVA_HOME %JDK13PATH% - JDKINC %JDK13PATH%/include:%JDK13PATH%/include/linux - JDKINCS -I%JDK13PATH%/include -I%JDK13PATH%/include/linux - JDKLIB %JDK13PATH%/jre/lib:%JDK13PATH%/jre/lib/i386:%JDK13PATH%/jre/lib/i386/client - JDKLIBS -L%JDK13PATH%/jre/lib -L%JDK13PATH%/jre/lib/i386 -L%JDK13PATH%/jre/lib/i386/client - JDKPATH %JDK13PATH%/bin - JDK_VERSION 131 - XCLASSPATH .:%JDK13PATH%/jre/lib/rt.jar:%JDK13PATH%/lib/tools.jar - } - jdk13path:0 IF X%JDK_PATH%X != XX - { - SOLAR_JDK13PATH %JDK_PATH% - } jdk14 { JAVA_HOME %JDK15PATH% @@ -1457,7 +1401,7 @@ unxmacxi SYSBASE_ROOT USER } - order common0 bs_sourceroot envroot:0 sourceroot:0 sysbaseroot common1 jdk13path:0 jdk14path:0 jdk15path:0 distroot:0 nativecvs cap cax compath common2 pro stl:0 stl:1 common jdk13 jdk14 jdk15 pre + order common0 bs_sourceroot envroot:0 sourceroot:0 sysbaseroot common1 jdk14path:0 jdk15path:0 distroot:0 nativecvs cap cax compath common2 pro stl:0 stl:1 common jdk14 jdk15 pre reset { CLASSPATH @@ -1510,8 +1454,6 @@ unxmacxi debug distroot envroot - jdk13 - jdk13path jdk14 jdk14path jdk15 @@ -1649,21 +1591,6 @@ unxsoli4 { SOLAR_ENV_ROOT %ENV_ROOT% } - jdk13 - { - JAVA_HOME %JDK13PATH% - JDKINC %JDK13PATH%/include:%JDK13PATH%/include/solaris - JDKINCS -I%JDK13PATH%/include -I%JDK13PATH%/include/solaris - JDKLIB %JDK13PATH%/jre/lib/i386:%JDK13PATH%/lib:%JDK13PATH%/jre/lib/i386/native_threads:%JDK13PATH%/jre/plugin/i386:%JDK13PATH%/jre/lib/i386/motif21 - JDKLIBS -L%JDK13PATH%/jre/lib/i386 -L%JDK13PATH%/lib -L%JDK13PATH%/jre/lib/i386/native_threads -L%JDK13PATH%/jre/plugin/i386 -L%JDK13PATH%/jre/plugin/i386 -L%JDK13PATH%/jre/lib/i386/motif21 - JDKPATH %JDK13PATH%/bin - JDK_VERSION 131 - XCLASSPATH .:%JDK13PATH%/jre/lib/rt.jar:%JDK13PATH%/jre/lib/i18n.jar:%JDK13PATH%/lib/tools.jar:%JDK13PATH%/jre/lib/javaplugin.jar - } - jdk13path:0 if X%JDK_PATH%X != XX - { - SOLAR_JDK13PATH %JDK_PATH% - } jdk14 { JAVA_HOME %JDK14PATH% @@ -1755,7 +1682,7 @@ unxsoli4 SYSBASE_ROOT USER } - order common0 bs_sourceroot envroot:0 sourceroot:0 common1 distroot:0 jdk13path:0 jdk14path:0 jdk15path:0 ojdk16path:0 sysbaseroot cap cax compath nativecvs common2 pro stl:1 stl:0 common jdk13 jdk14 jdk15 ojdk16 pre + order common0 bs_sourceroot envroot:0 sourceroot:0 common1 distroot:0 jdk14path:0 jdk15path:0 ojdk16path:0 sysbaseroot cap cax compath nativecvs common2 pro stl:1 stl:0 common jdk14 jdk15 ojdk16 pre reset { CLASSPATH @@ -1802,8 +1729,6 @@ unxsoli4 compath STAR_COMPATH distroot envroot - jdk13 - jdk13path jdk14 jdk14path jdk15 @@ -1950,21 +1875,6 @@ unxsols4 { SOLAR_ENV_ROOT %ENV_ROOT% } - jdk13 - { - JAVA_HOME %JDK13PATH% - JDKINC %JDK13PATH%/include:%JDK13PATH%/include/solaris - JDKINCS -I%JDK13PATH%/include -I%JDK13PATH%/include/solaris - JDKLIB %JDK13PATH%/jre/lib/sparc:%JDK13PATH%/lib:%JDK13PATH%/jre/lib/sparc/native_threads:%JDK13PATH%/jre/plugin/sparc:%JDK13PATH%/jre/lib/sparc/motif21 - JDKLIBS -L%JDK13PATH%/jre/lib/sparc -L%JDK13PATH%/lib -L%JDK13PATH%/jre/lib/sparc/native_threads -L%JDK13PATH%/jre/plugin/sparc -L%JDK13PATH%/jre/plugin/sparc -L%JDK13PATH%/jre/lib/sparc/motif21 - JDKPATH %JDK13PATH%/bin - JDK_VERSION 131 - XCLASSPATH .:%JDK13PATH%/jre/lib/rt.jar:%JDK13PATH%/jre/lib/i18n.jar:%JDK13PATH%/lib/tools.jar:%JDK13PATH%/jre/lib/javaplugin.jar - } - jdk13path:0 if X%JDK_PATH%X != XX - { - SOLAR_JDK13PATH %JDK_PATH% - } jdk14 { JAVA_HOME %JDK14PATH% @@ -2057,7 +1967,7 @@ unxsols4 SYSBASE_ROOT USER } - order common0 bs_sourceroot envroot:0 sourceroot:0 common1 distroot:0 jdk13path:0 jdk14path:0 jdk15path:0 ojdk16path:0 sysbaseroot cap cax compath nativecvs common2 common:3 pro stl:1 stl:0 common jdk13 jdk14 jdk15 ojdk16 pre + order common0 bs_sourceroot envroot:0 sourceroot:0 common1 distroot:0 jdk14path:0 jdk15path:0 ojdk16path:0 sysbaseroot cap cax compath nativecvs common2 common:3 pro stl:1 stl:0 common jdk14 jdk15 ojdk16 pre reset { CLASSPATH @@ -2104,8 +2014,6 @@ unxsols4 compath STAR_COMPATH distroot envroot - jdk13 - jdk13path jdk14 jdk14path jdk15 @@ -2777,25 +2685,6 @@ wntgcci1 { SOLAR_ENV_ROOT %ENV_ROOT% } - jdk13 - { - HOMEDRIVE %DEVROOT% - HOMEPATH $/jdk131 - JAVAHOME %JDK13PATH% - JAVA_HOME %JDK13PATH% - JDKINC %JDK13PATH%$/include$:%JDK13PATH%$/include$/win32 - JDKINCS -I%JDK13PATH%$/include -I%JDK13PATH%$/include$/win32 - JDKLIB %JDK13PATH%$/lib - JDKLIBS %JDK13PATH%$/lib - JDKPATH %JDK13PATH%$/bin - JDK_VERSION 131 - JREPATH %JDK13PATH%$/jre$/bin$/hotspot - XCLASSPATH .$:%JDK13PATH%$/jre$/lib$/rt.jar$:%JDK13PATH%$/lib$/tools.jar - } - jdk13path:0 if X%JDK_PATH%X != XX - { - SOLAR_JDK13PATH %JDK_PATH% - } jdk14 { HOMEDRIVE %DEVROOT% @@ -2873,7 +2762,7 @@ wntgcci1 SOURCE_ROOT STL_ROOT } - order common0 bs_sourceroot envroot:0 sourceroot:0 common1 distroot:0 cap cax psdk compath common2 jdk13path:0 jdk14path:0 jdk15path:0 stl:1 stl:0 common jdk13 jdk14 jdk15 pre + order common0 bs_sourceroot envroot:0 sourceroot:0 common1 distroot:0 cap cax psdk compath common2 jdk14path:0 jdk15path:0 stl:1 stl:0 common jdk14 jdk15 pre reset { COPYALL @@ -2927,8 +2816,6 @@ wntgcci1 compath STAR_COMPATH distroot envroot - jdk13 - jdk13path jdk14 jdk14path jdk15 @@ -3095,25 +2982,6 @@ wntmsci11 { SOLAR_ENV_ROOT %ENV_ROOT% } - jdk13 - { - HOMEDRIVE %DEVROOT% - HOMEPATH $/jdk131 - JAVAHOME %JDK13PATH% - JAVA_HOME %JDK13PATH% - JDKINC %JDK13PATH%$/include$:%JDK13PATH%$/include$/win32 - JDKINCS -I%JDK13PATH%$/include -I%JDK13PATH%$/include$/win32 - JDKLIB %JDK13PATH%$/lib - JDKLIBS %JDK13PATH%$/lib - JDKPATH %JDK13PATH%$/bin - JDK_VERSION 131 - JREPATH %JDK13PATH%$/jre$/bin$/hotspot - XCLASSPATH .$:%JDK13PATH%$/jre$/lib$/rt.jar$:%JDK13PATH%$/lib$/tools.jar - } - jdk13path:0 if X%JDK_PATH%X != XX - { - SOLAR_JDK13PATH %JDK_PATH% - } jdk14 { HOMEDRIVE %DEVROOT% @@ -3191,7 +3059,7 @@ wntmsci11 SOURCE_ROOT STL_ROOT } - order common0 bs_sourceroot envroot:0 sourceroot:0 common1 distroot:0 cap cax psdk compath common2 jdk13path:0 jdk14path:0 jdk15path:0 stl:1 stl:0 common jdk13 jdk14 jdk15 pre + order common0 bs_sourceroot envroot:0 sourceroot:0 common1 distroot:0 cap cax psdk compath common2 jdk14path:0 jdk15path:0 stl:1 stl:0 common jdk14 jdk15 pre reset { COPYALL @@ -3220,8 +3088,6 @@ wntmsci11 compath STAR_COMPATH distroot envroot - jdk13 - jdk13path jdk14 jdk14path jdk15 @@ -3425,25 +3291,6 @@ wntmsci12 { SOLAR_ENV_ROOT $dp(%ENV_ROOT%) } - jdk13 - { -# HOMEDRIVE %DEVROOT% -# HOMEPATH $/jdk131 - JAVAHOME %JDK13PATH% - JAVA_HOME %JDK13PATH% - JDKINC %JDK13PATH%$/include;%JDK13PATH%$/include$/win32 - JDKINCS -I%JDK13PATH%$/include -I%JDK13PATH%$/include$/win32 - JDKLIB %JDK13PATH%$/lib - JDKLIBS %JDK13PATH%$/lib - JDKPATH %JDK13PATH%$/bin - JDK_VERSION 131 - JREPATH %JDK13PATH%$/jre$/bin$/hotspot - XCLASSPATH .;%JDK13PATH%$/jre$/lib$/rt.jar;%JDK13PATH%$/lib$/tools.jar - } - jdk13path:0 if X%JDK_PATH%X != XX - { - SOLAR_JDK13PATH $dp(%JDK_PATH%) - } jdk14 { # HOMEDRIVE %DEVROOT% @@ -3550,7 +3397,7 @@ wntmsci12 $dp(TMP) $dp(TEMP) } - order nojava common0 bs_sourceroot tmp envroot:0 sourceroot:0 pro common1 distroot:0 cap cax common02 psdk compath common2 common:3 jdk13path:0 jdk14path:0 jdk15path:0 ojdk16path:0 stl:1 stl:0 common jdk13 jdk14 jdk15 ojdk16 pre + order nojava common0 bs_sourceroot tmp envroot:0 sourceroot:0 pro common1 distroot:0 cap cax common02 psdk compath common2 common:3 jdk14path:0 jdk15path:0 ojdk16path:0 stl:1 stl:0 common jdk14 jdk15 ojdk16 pre reset { COPYALL @@ -3601,8 +3448,6 @@ wntmsci12 compath STAR_COMPATH distroot envroot - jdk13 - jdk13path jdk14 jdk14path jdk15 @@ -3810,25 +3655,6 @@ wntmsci13 { SOLAR_ENV_ROOT $dp(%ENV_ROOT%) } - jdk13 - { -# HOMEDRIVE %DEVROOT% -# HOMEPATH $/jdk131 - JAVAHOME %JDK13PATH% - JAVA_HOME %JDK13PATH% - JDKINC %JDK13PATH%$/include;%JDK13PATH%$/include$/win32 - JDKINCS -I%JDK13PATH%$/include -I%JDK13PATH%$/include$/win32 - JDKLIB %JDK13PATH%$/lib - JDKLIBS %JDK13PATH%$/lib - JDKPATH %JDK13PATH%$/bin - JDK_VERSION 131 - JREPATH %JDK13PATH%$/jre$/bin$/hotspot - XCLASSPATH .;%JDK13PATH%$/jre$/lib$/rt.jar;%JDK13PATH%$/lib$/tools.jar - } - jdk13path:0 if X%JDK_PATH%X != XX - { - SOLAR_JDK13PATH $dp(%JDK_PATH%) - } jdk14 { # HOMEDRIVE %DEVROOT% @@ -3935,7 +3761,7 @@ wntmsci13 $dp(TMP) $dp(TEMP) } - order nojava common0 bs_sourceroot tmp envroot:0 sourceroot:0 pro common1 distroot:0 cap cax common02 psdk compath common2 common:3 jdk13path:0 jdk14path:0 jdk15path:0 ojdk16path:0 stl:1 stl:0 common jdk13 jdk14 jdk15 ojdk16 pre + order nojava common0 bs_sourceroot tmp envroot:0 sourceroot:0 pro common1 distroot:0 cap cax common02 psdk compath common2 common:3 jdk14path:0 jdk15path:0 ojdk16path:0 stl:1 stl:0 common jdk14 jdk15 ojdk16 pre reset { COPYALL @@ -3986,8 +3812,6 @@ wntmsci13 compath STAR_COMPATH distroot envroot - jdk13 - jdk13path jdk14 jdk14path jdk15 -- cgit From d0fdda4a1a8c9d25fc175a7b57e14e1685824e89 Mon Sep 17 00:00:00 2001 From: Hans-Joachim Lankenau Date: Wed, 25 Nov 2009 17:19:13 +0100 Subject: ause106: #161178# remove -pre switch and usage --- solenv/config/sdev300.ini | 109 +++++----------------------------------------- solenv/inc/settings.mk | 11 ----- solenv/inc/target.mk | 12 ++--- 3 files changed, 15 insertions(+), 117 deletions(-) (limited to 'solenv') diff --git a/solenv/config/sdev300.ini b/solenv/config/sdev300.ini index cdecb1c3f746..40d0b501c607 100644 --- a/solenv/config/sdev300.ini +++ b/solenv/config/sdev300.ini @@ -472,14 +472,6 @@ unxfbsdi { *cvs %STAR_NATIVECVS% } - pre - { - ILIB %PRE%/lib:%ILIB% - LD_LIBRARY_PATH %PRE%/lib:%LD_LIBRARY_PATH% - LIB %PRE%/lib:%LIB% - SOLARINC -I. -I%PRE%/inc %SOLARINC% - SOLARLIB -L%PRE%/lib %SOLARLIB% -L/usr/X11R6/lib - } pro { PROSWITCH -DPRODUCT @@ -516,7 +508,7 @@ unxfbsdi SYSBASE_ROOT USER } - order common0 bs_sourceroot envroot:0 sourceroot:0 sysbaseroot common1 jdk14path:0 jdk15path:0 distroot:0 nativecvs cap cax compath common2 pro stl:0 stl:1 common jdk14 jdk15 debug pre + order common0 bs_sourceroot envroot:0 sourceroot:0 sysbaseroot common1 jdk14path:0 jdk15path:0 distroot:0 nativecvs cap cax compath common2 pro stl:0 stl:1 common jdk14 jdk15 debug reset { CLASSPATH @@ -575,7 +567,6 @@ unxfbsdi jdk15path l10n L10N_framework nativecvs STAR_NATIVECVS - pre PRE pro sourceroot stl @@ -767,13 +758,6 @@ unxlngi6 { SOLAR_OJDK16PATH %JDK_PATH% } - pre - { - ILIB %PRE%/lib:%ILIB% - LIB %PRE%/lib:%LIB% - SOLARINC -I. -I%PRE%/inc %SOLARINC% - SOLARLIB -L%PRE%/lib %SOLARLIB% -L/usr/X11R6/lib - } pro { PROSWITCH -DPRODUCT @@ -810,7 +794,7 @@ unxlngi6 SYSBASE_ROOT USER } - order common0 bs_sourceroot envroot:0 sourceroot:0 sysbaseroot common1 jdk14path:0 jdk15path:0 ojdk16path:0 distroot:0 nativecvs cap cax compath common2 pro common3:0 stl:0 stl:1 common jdk14 jdk15 ojdk16 pre + order common0 bs_sourceroot envroot:0 sourceroot:0 sysbaseroot common1 jdk14path:0 jdk15path:0 ojdk16path:0 distroot:0 nativecvs cap cax compath common2 pro common3:0 stl:0 stl:1 common jdk14 jdk15 ojdk16 reset { CLASSPATH @@ -871,7 +855,6 @@ unxlngi6 nativecvs STAR_NATIVECVS ojdk16 ojdk16path - pre PRE pro sourceroot stl @@ -1065,13 +1048,6 @@ unxlngx6 { SOLAR_OJDK16PATH %JDK_PATH% } - pre - { - ILIB %PRE%/lib:%ILIB% - LIB %PRE%/lib:%LIB% - SOLARINC -I. -I%PRE%/inc %SOLARINC% - SOLARLIB -L%PRE%/lib %SOLARLIB% -L/usr/X11R6/lib - } pro { PROSWITCH -DPRODUCT @@ -1108,7 +1084,7 @@ unxlngx6 SYSBASE_ROOT USER } - order common0 bs_sourceroot envroot:0 sourceroot:0 sysbaseroot common1 jdk14path:0 jdk15path:0 ojdk16path:0 distroot:0 nativecvs cap cax compath common2 common3:0 pro stl:0 stl:1 common jdk14 jdk15 ojdk16 pre + order common0 bs_sourceroot envroot:0 sourceroot:0 sysbaseroot common1 jdk14path:0 jdk15path:0 ojdk16path:0 distroot:0 nativecvs cap cax compath common2 common3:0 pro stl:0 stl:1 common jdk14 jdk15 ojdk16 reset { CLASSPATH @@ -1169,7 +1145,6 @@ unxlngx6 nativecvs STAR_NATIVECVS ojdk16 ojdk16path - pre PRE pro sourceroot stl @@ -1358,13 +1333,6 @@ unxmacxi { *cvs %STAR_NATIVECVS% } - pre - { - ILIB %PRE%/lib:%ILIB% - LIB %PRE%/lib:%LIB% - SOLARINC -I. -I%PRE%/inc %SOLARINC% - SOLARLIB -L%PRE%/lib %SOLARLIB% -L/usr/X11R6/lib - } pro { PROSWITCH -DPRODUCT @@ -1401,7 +1369,7 @@ unxmacxi SYSBASE_ROOT USER } - order common0 bs_sourceroot envroot:0 sourceroot:0 sysbaseroot common1 jdk14path:0 jdk15path:0 distroot:0 nativecvs cap cax compath common2 pro stl:0 stl:1 common jdk14 jdk15 pre + order common0 bs_sourceroot envroot:0 sourceroot:0 sysbaseroot common1 jdk14path:0 jdk15path:0 distroot:0 nativecvs cap cax compath common2 pro stl:0 stl:1 common jdk14 jdk15 reset { CLASSPATH @@ -1460,7 +1428,6 @@ unxmacxi jdk15path l10n L10N_framework nativecvs STAR_NATIVECVS - pre PRE pro sourceroot stl @@ -1640,12 +1607,6 @@ unxsoli4 { SOLAR_OJDK16PATH %JDK_PATH% } - pre - { - ILIB %PRE%/lib:%ILIB% - SOLARINC -I. -I%PRE%/inc %SOLARINC% - SOLARLIB -L%PRE%/lib %SOLARLIB% - } pro { PROSWITCH -DPRODUCT @@ -1682,7 +1643,7 @@ unxsoli4 SYSBASE_ROOT USER } - order common0 bs_sourceroot envroot:0 sourceroot:0 common1 distroot:0 jdk14path:0 jdk15path:0 ojdk16path:0 sysbaseroot cap cax compath nativecvs common2 pro stl:1 stl:0 common jdk14 jdk15 ojdk16 pre + order common0 bs_sourceroot envroot:0 sourceroot:0 common1 distroot:0 jdk14path:0 jdk15path:0 ojdk16path:0 sysbaseroot cap cax compath nativecvs common2 pro stl:1 stl:0 common jdk14 jdk15 ojdk16 reset { CLASSPATH @@ -1737,7 +1698,6 @@ unxsoli4 nativecvs STAR_NATIVECVS ojdk16 ojdk16path - pre PRE pro sourceroot stl @@ -1924,12 +1884,6 @@ unxsols4 { SOLAR_OJDK16PATH %JDK_PATH% } - pre - { - ILIB %PRE%/lib:%ILIB% - SOLARINC -I. -I%PRE%/inc %SOLARINC% - SOLARLIB -L%PRE%/lib %SOLARLIB% - } pro { PROSWITCH -DPRODUCT @@ -1967,7 +1921,7 @@ unxsols4 SYSBASE_ROOT USER } - order common0 bs_sourceroot envroot:0 sourceroot:0 common1 distroot:0 jdk14path:0 jdk15path:0 ojdk16path:0 sysbaseroot cap cax compath nativecvs common2 common:3 pro stl:1 stl:0 common jdk14 jdk15 ojdk16 pre + order common0 bs_sourceroot envroot:0 sourceroot:0 common1 distroot:0 jdk14path:0 jdk15path:0 ojdk16path:0 sysbaseroot cap cax compath nativecvs common2 common:3 pro stl:1 stl:0 common jdk14 jdk15 ojdk16 reset { CLASSPATH @@ -2022,7 +1976,6 @@ unxsols4 nativecvs STAR_NATIVECVS ojdk16 ojdk16path - pre PRE pro sourceroot stl @@ -2180,12 +2133,6 @@ unxsolu4 { *cvs %STAR_NATIVECVS% } - pre - { - ILIB %PRE%/lib:%ILIB% - SOLARINC -I. -I%PRE%/inc %SOLARINC% - SOLARLIB -L%PRE%/lib %SOLARLIB% - } pro { PROSWITCH -DPRODUCT @@ -2223,7 +2170,7 @@ unxsolu4 SYSBASE_ROOT USER } - order common0 bs_sourceroot envroot:0 sourceroot:0 common1 distroot:0 jdk15path:0 sysbaseroot cap cax compath nativecvs common2 common:3 pro stl:1 stl:0 common jdk15 pre + order common0 bs_sourceroot envroot:0 sourceroot:0 common1 distroot:0 jdk15path:0 sysbaseroot cap cax compath nativecvs common2 common:3 pro stl:1 stl:0 common jdk15 reset { CLASSPATH @@ -2274,7 +2221,6 @@ unxsolu4 jdk15path l10n L10N_framework nativecvs STAR_NATIVECVS - pre PRE pro sourceroot stl @@ -2455,12 +2401,6 @@ unxubti8 { SOLAR_OJDK16PATH %JDK_PATH% } - pre - { - LD_LIBRARY_PATH %PRE%/lib:%LD_LIBRARY_PATH% - SOLARINC -I. -I%PRE%/inc %SOLARINC% - SOLARLIB -L../lib -L%PRE%/lib %SOLARLIB% -L/usr/X11R6/lib - } pro { PROSWITCH -DPRODUCT @@ -2496,7 +2436,7 @@ unxubti8 STL_ROOT USER } - order common0 bs_sourceroot envroot:0 sourceroot:0 common1 ojdk16path:0 distroot:0 nativecvs cap cax compath common2 pro stl:0 stl:1 common jdk15 ojdk16 debug pre + order common0 bs_sourceroot envroot:0 sourceroot:0 common1 ojdk16path:0 distroot:0 nativecvs cap cax compath common2 pro stl:0 stl:1 common jdk15 ojdk16 debug reset { CLASSPATH @@ -2539,7 +2479,6 @@ unxubti8 nativecvs STAR_NATIVECVS ojdk16 ojdk16path - pre PRE pro sourceroot } @@ -2723,11 +2662,6 @@ wntgcci1 { SOLAR_JDK15PATH %JDK_PATH% } - pre - { - ILIB %PRE%$/lib$:%ILIB% - LIB %PRE%$/lib$:%LIB% - } psdk { PSDK %STAR_PSDK% @@ -2762,7 +2696,7 @@ wntgcci1 SOURCE_ROOT STL_ROOT } - order common0 bs_sourceroot envroot:0 sourceroot:0 common1 distroot:0 cap cax psdk compath common2 jdk14path:0 jdk15path:0 stl:1 stl:0 common jdk14 jdk15 pre + order common0 bs_sourceroot envroot:0 sourceroot:0 common1 distroot:0 cap cax psdk compath common2 jdk14path:0 jdk15path:0 stl:1 stl:0 common jdk14 jdk15 reset { COPYALL @@ -2821,7 +2755,6 @@ wntgcci1 jdk15 jdk15path l10n L10N_framework - pre PRE pro psdk STAR_PSDK shell STAR_USE_SHELL @@ -3020,11 +2953,6 @@ wntmsci11 { SOLAR_JDK15PATH %JDK_PATH% } - pre - { - ILIB %PRE%$/lib$:%ILIB% - LIB %PRE%$/lib$:%LIB% - } psdk { PSDK %STAR_PSDK% @@ -3059,7 +2987,7 @@ wntmsci11 SOURCE_ROOT STL_ROOT } - order common0 bs_sourceroot envroot:0 sourceroot:0 common1 distroot:0 cap cax psdk compath common2 jdk14path:0 jdk15path:0 stl:1 stl:0 common jdk14 jdk15 pre + order common0 bs_sourceroot envroot:0 sourceroot:0 common1 distroot:0 cap cax psdk compath common2 jdk14path:0 jdk15path:0 stl:1 stl:0 common jdk14 jdk15 reset { COPYALL @@ -3093,7 +3021,6 @@ wntmsci11 jdk15 jdk15path l10n L10N_framework - pre PRE pro psdk STAR_PSDK shell STAR_USE_SHELL @@ -3351,11 +3278,6 @@ wntmsci12 { SOLAR_OJDK16PATH $dp(%JDK_PATH%) } - pre - { - ILIB %PRE%$/lib;%ILIB% - LIB %PRE%$/lib;%LIB% - } pro { RES_ENUS TRUE @@ -3397,7 +3319,7 @@ wntmsci12 $dp(TMP) $dp(TEMP) } - order nojava common0 bs_sourceroot tmp envroot:0 sourceroot:0 pro common1 distroot:0 cap cax common02 psdk compath common2 common:3 jdk14path:0 jdk15path:0 ojdk16path:0 stl:1 stl:0 common jdk14 jdk15 ojdk16 pre + order nojava common0 bs_sourceroot tmp envroot:0 sourceroot:0 pro common1 distroot:0 cap cax common02 psdk compath common2 common:3 jdk14path:0 jdk15path:0 ojdk16path:0 stl:1 stl:0 common jdk14 jdk15 ojdk16 reset { COPYALL @@ -3456,7 +3378,6 @@ wntmsci12 nojava ojdk16 ojdk16path - pre PRE pro psdk STAR_PSDK shell STAR_USE_SHELL @@ -3715,11 +3636,6 @@ wntmsci13 { SOLAR_OJDK16PATH $dp(%JDK_PATH%) } - pre - { - ILIB %PRE%$/lib;%ILIB% - LIB %PRE%$/lib;%LIB% - } pro { RES_ENUS TRUE @@ -3761,7 +3677,7 @@ wntmsci13 $dp(TMP) $dp(TEMP) } - order nojava common0 bs_sourceroot tmp envroot:0 sourceroot:0 pro common1 distroot:0 cap cax common02 psdk compath common2 common:3 jdk14path:0 jdk15path:0 ojdk16path:0 stl:1 stl:0 common jdk14 jdk15 ojdk16 pre + order nojava common0 bs_sourceroot tmp envroot:0 sourceroot:0 pro common1 distroot:0 cap cax common02 psdk compath common2 common:3 jdk14path:0 jdk15path:0 ojdk16path:0 stl:1 stl:0 common jdk14 jdk15 ojdk16 reset { COPYALL @@ -3820,7 +3736,6 @@ wntmsci13 nojava ojdk16 ojdk16path - pre PRE pro psdk STAR_PSDK shell STAR_USE_SHELL diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk index 8d068bd28c04..d592a487fa1e 100644 --- a/solenv/inc/settings.mk +++ b/solenv/inc/settings.mk @@ -752,9 +752,6 @@ INCLOCPRJ=$(foreach,i,$(PRJINC) $i/inc) INCDEPN+=$(INCLOCPRJ) .ENDIF .IF "$(INCPRE)"!="" -INCDEPN+=$(INCPRE) -.ENDIF - # Resource-Pfad fuer .SRS .IF "$(common_build_srs)"!="" @@ -849,12 +846,7 @@ LOCALIZESDF:=$(COMMONMISC)$/$(PRJNAME)$/dummy$/localize.sdf .ENDIF # "$(LOCALIZESDF)"=="" .ENDIF # "$(WITH_LANG)"!="" -.IF "$(PRE)"=="" -#JARDIR=$(CLASSDIR) JARDIR=$(OUT)/class -.ELSE -JARDIR=$(PRE)/class -.ENDIF # needs to be expanded!!! @@ -897,9 +889,6 @@ UNOIDLDEFS+=-DSUPD=$(UPD) -DUPD=$(UPD) UNOIDLDEPFLAGS=-Mdepend=$(SOLARVER) -.IF "$(PRE)"!="" -UNOIDLINC!:=-I$(PRE)/idl $(UNOIDLINC) -.ENDIF UNOIDLINC+=-I. -I.. -I$(PRJ) -I$(PRJ)/inc -I$(PRJ)/$(INPATH)/idl -I$(OUT)/inc -I$(SOLARIDLDIR) -I$(SOLARINCDIR) CDEFS= -D$(OS) -D$(GUI) -D$(GVER) -D$(COM) -D$(CVER) -D$(CPUNAME) diff --git a/solenv/inc/target.mk b/solenv/inc/target.mk index eb4b35008e8a..24d95883f16b 100644 --- a/solenv/inc/target.mk +++ b/solenv/inc/target.mk @@ -55,9 +55,6 @@ target_empty=warn_target_empty INCEXT*=. INCPRE*=. INCPOST*=. -.IF "$(PRE)"!="" -ENVINCPRE+=-I$(PRE)/inc -.ENDIF # "$(PRE)"!="" .IF "$(BOOTSTRAP_SERVICE)"!="TRUE" && "$(NO_OFFUH)"=="" UNOINCLUDES=$(SOLARINCDIR)/offuh .ENDIF # "$(BOOTSTRAP_SERVICE)"!="TRUE" && "$(NO_OFFUH)"=="" @@ -66,9 +63,9 @@ SOLARINC+=$(JDKINCS) INCLUDE:= .EXPORT : INCLUDE .IF "$(PRJINC)"!="" -INCLUDE!:=-I. $(ENVINCPRE) $(INCPRE:^"-I":s/-I-I/-I/) -I$(INCLOCAL) $(INCLOCPRJ:^"-I":s/-I-I/-I/) -I$(INCPCH) -I$(INC) -I$(INCGUI) -I$(INCCOM) $(SOLARINC) $(null,$(UNOINCLUDES) $(NULL) -I$(UNOINCLUDES)) -I$(INCEXT) -I$(PRJ)/res -I$(INCPOST) +INCLUDE!:=-I. $(INCPRE:^"-I":s/-I-I/-I/) -I$(INCLOCAL) $(INCLOCPRJ:^"-I":s/-I-I/-I/) -I$(INCPCH) -I$(INC) -I$(INCGUI) -I$(INCCOM) $(SOLARINC) $(null,$(UNOINCLUDES) $(NULL) -I$(UNOINCLUDES)) -I$(INCEXT) -I$(PRJ)/res -I$(INCPOST) .ELSE # "$(PRJINC)"!="" -INCLUDE!:=-I. $(ENVINCPRE) $(INCPRE:^"-I":s/-I-I/-I/) -I$(INCLOCAL) -I$(INCPCH) -I$(INC) -I$(INCGUI) -I$(INCCOM) $(SOLARINC) $(null,$(UNOINCLUDES) $(NULL) -I$(UNOINCLUDES)) -I$(INCEXT) -I$(PRJ)/res -I$(INCPOST) +INCLUDE!:=-I. $(INCPRE:^"-I":s/-I-I/-I/) -I$(INCLOCAL) -I$(INCPCH) -I$(INC) -I$(INCGUI) -I$(INCCOM) $(SOLARINC) $(null,$(UNOINCLUDES) $(NULL) -I$(UNOINCLUDES)) -I$(INCEXT) -I$(PRJ)/res -I$(INCPOST) .ENDIF # "$(PRJINC)"!="" INCLUDE_C=$(subst,/stl$(SPACECHAR),dont_use_stl$(SPACECHAR) $(INCLUDE)) .EXPORT : LIB @@ -583,7 +580,7 @@ SHL3BASEX=/BASE:$(SHL3BASE) .IF "$(WINVERSIONNAMES)"!="" SHL4TARGET!:=$(SHL4TARGET)$($(WINVERSIONNAMES)_MAJOR) .ENDIF # "$(WINVERSIONNAMES)"!="" -SHL4DLLPRE*=$(DLLPRE) +SHL4DLLpre*=$(DLLPRE) SHL4TARGETN=$(DLLDEST)/$(SHL4DLLPRE)$(SHL4TARGET)$(DLLPOST) .IF "$(BASE)" != "" .IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2" @@ -1259,9 +1256,6 @@ CPPUMAKERFLAGS*=-L .IF "$(UNOTYPES)" != "" # makeing all in one .DIRCACHE=no -.IF "$(ENVINCPRE)"!="" -MKDEPFLAGS+=-I:$(ENVINCPRE) -.ENDIF # "$(ENVINCPRE))"!="" .IF "$(OBJFILES)"!="" $(OBJFILES) : $(UNOUCRTARGET) .ENDIF # "$(OBJFILES)"!="" -- cgit From 9cf8164598c069dd81bed567bfb9741dec13e98a Mon Sep 17 00:00:00 2001 From: Hans-Joachim Lankenau Date: Wed, 25 Nov 2009 17:23:11 +0100 Subject: ause106: #161178# remove -nojava switch and usage --- solenv/config/sdev300.ini | 21 +++------------------ solenv/inc/settings.mk | 17 ----------------- 2 files changed, 3 insertions(+), 35 deletions(-) (limited to 'solenv') diff --git a/solenv/config/sdev300.ini b/solenv/config/sdev300.ini index 40d0b501c607..42f3e5f0c654 100644 --- a/solenv/config/sdev300.ini +++ b/solenv/config/sdev300.ini @@ -85,10 +85,6 @@ common { MAXPROC maxproc=%MAXPROCESS% } - nojava - { - DISABLE_JAVA TRUE - } nosource { LU_NOSOURCE no_source @@ -138,7 +134,7 @@ common STL_ROOT UPDATER } - order common:2 common:3 pro:0 pro:1 common common:0 btarget zipsource cwsname common:1 nojava shell tmp crashdump maxproc hg r_only nosource + order common:2 common:3 pro:0 pro:1 common common:0 btarget zipsource cwsname common:1 shell tmp crashdump maxproc hg r_only nosource reset { ALT_L10N_MODULE @@ -178,7 +174,6 @@ common cwsname CWS_WORK_STAMP envroot hg - nojava nosource pro maxproc MAXPROCESS @@ -3256,10 +3251,6 @@ wntmsci12 { SOLAR_JDK15PATH $dp(%JDK_PATH%) } - nojava - { - DISABLE_JAVA TRUE - } ojdk16 { # HOMEDRIVE %DEVROOT% @@ -3319,7 +3310,7 @@ wntmsci12 $dp(TMP) $dp(TEMP) } - order nojava common0 bs_sourceroot tmp envroot:0 sourceroot:0 pro common1 distroot:0 cap cax common02 psdk compath common2 common:3 jdk14path:0 jdk15path:0 ojdk16path:0 stl:1 stl:0 common jdk14 jdk15 ojdk16 + order common0 bs_sourceroot tmp envroot:0 sourceroot:0 pro common1 distroot:0 cap cax common02 psdk compath common2 common:3 jdk14path:0 jdk15path:0 ojdk16path:0 stl:1 stl:0 common jdk14 jdk15 ojdk16 reset { COPYALL @@ -3375,7 +3366,6 @@ wntmsci12 jdk15 jdk15path l10n L10N_framework - nojava ojdk16 ojdk16path pro @@ -3614,10 +3604,6 @@ wntmsci13 { SOLAR_JDK15PATH $dp(%JDK_PATH%) } - nojava - { - DISABLE_JAVA TRUE - } ojdk16 { # HOMEDRIVE %DEVROOT% @@ -3677,7 +3663,7 @@ wntmsci13 $dp(TMP) $dp(TEMP) } - order nojava common0 bs_sourceroot tmp envroot:0 sourceroot:0 pro common1 distroot:0 cap cax common02 psdk compath common2 common:3 jdk14path:0 jdk15path:0 ojdk16path:0 stl:1 stl:0 common jdk14 jdk15 ojdk16 + order common0 bs_sourceroot tmp envroot:0 sourceroot:0 pro common1 distroot:0 cap cax common02 psdk compath common2 common:3 jdk14path:0 jdk15path:0 ojdk16path:0 stl:1 stl:0 common jdk14 jdk15 ojdk16 reset { COPYALL @@ -3733,7 +3719,6 @@ wntmsci13 jdk15 jdk15path l10n L10N_framework - nojava ojdk16 ojdk16path pro diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk index d592a487fa1e..d2c77abd1394 100644 --- a/solenv/inc/settings.mk +++ b/solenv/inc/settings.mk @@ -1220,26 +1220,9 @@ STDLIB+=$(FILLUPARC) STDSHL+=$(FILLUPARC) .ENDIF # "$(FILUPARC)"!="" -.IF "$(DISABLE_JAVA)"=="" .IF "$(SOLAR_JAVA)"!="" CDEFS+=$(JAVADEF) .ENDIF # "$(SOLAR_JAVA)"!="" -.ELSE # "$(DISABLE_JAVA)"=="" -SOLAR_JAVA!:= -.EXPORT : SOLAR_JAVA -.IF "$(JDKPATH)"!="" -environment_confusion: - @echo ---------------------------------------------------------- - @echo - - @echo - Error! - @echo - - @echo - $$JDKPATH and $$DISABLE_JAVA are set. this will lead - @echo - to impropper results. - @echo - - @echo ---------------------------------------------------------- - force_dmake_to_error -.ENDIF # "$(JDKPATH)"!="" -.ENDIF # "$(DISABLE_JAVA)"=="" .INCLUDE .IGNORE: $(UPD)$(LAST_MINOR).mk -- cgit From 47a4bbe01c8543ecdff68176196840860e1f4880 Mon Sep 17 00:00:00 2001 From: Hans-Joachim Lankenau Date: Wed, 25 Nov 2009 17:27:33 +0100 Subject: ause106: #161178# remove -btarget and -zipsource switches --- solenv/config/sdev300.ini | 52 +++++++++++++++++++---------------------------- 1 file changed, 21 insertions(+), 31 deletions(-) (limited to 'solenv') diff --git a/solenv/config/sdev300.ini b/solenv/config/sdev300.ini index 42f3e5f0c654..f7ffdadc2f40 100644 --- a/solenv/config/sdev300.ini +++ b/solenv/config/sdev300.ini @@ -2,10 +2,6 @@ common { environment { - btarget - { - BTARGET btarget=%BUILD_TARGET% - } common { ADDED_MODULES solenv default_images custom_images ooo_custom_images external_images postprocess instset_native instsetoo_native smoketest_native smoketestoo_native @@ -121,10 +117,6 @@ common { VERBOSE VERBOSE } - zipsource - { - ZIPSOURCE zipsource=%ZIP_SOURCE_URL% - } } extern { @@ -134,7 +126,7 @@ common STL_ROOT UPDATER } - order common:2 common:3 pro:0 pro:1 common common:0 btarget zipsource cwsname common:1 shell tmp crashdump maxproc hg r_only nosource + order common:2 common:3 pro:0 pro:1 common common:0 cwsname common:1 shell tmp crashdump maxproc hg r_only nosource reset { ALT_L10N_MODULE @@ -169,7 +161,6 @@ common } switches { - btarget BUILD_TARGET crashdump cwsname CWS_WORK_STAMP envroot @@ -181,7 +172,6 @@ common shell STAR_USE_SHELL tmp SOL_TMP_DIR verbose VERBOSE - zipsource ZIP_SOURCE_URL } } finish @@ -517,7 +507,7 @@ unxfbsdi { csh { - 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pj all $ZIPSOURCE $BTARGET $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE + 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pj all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE 600: umask 002 800: rehash 850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR @@ -528,7 +518,7 @@ unxfbsdi sh { 400: if [ $COPYALL ]; then - 410: $SOLAR_ENV_ROOT/etools/lucopy.pj all $ZIPSOURCE $BTARGET $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE + 410: $SOLAR_ENV_ROOT/etools/lucopy.pj all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE 415: fi 600: umask 002 800: hash -r @@ -803,7 +793,7 @@ unxlngi6 { csh { - 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pj all $ZIPSOURCE $BTARGET $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE + 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pj all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE 600: umask 002 800: rehash 850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR @@ -814,7 +804,7 @@ unxlngi6 sh { 400: if [ $COPYALL ]; then - 410: $SOLAR_ENV_ROOT/etools/lucopy.pj all $ZIPSOURCE $BTARGET $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE + 410: $SOLAR_ENV_ROOT/etools/lucopy.pj all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE 415: fi 600: umask 002 800: hash -r @@ -1093,7 +1083,7 @@ unxlngx6 { csh { - 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pj all $ZIPSOURCE $BTARGET $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE + 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pj all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE 600: umask 002 800: rehash 850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR @@ -1104,7 +1094,7 @@ unxlngx6 sh { 400: if [ $COPYALL ]; then - 410: $SOLAR_ENV_ROOT/etools/lucopy.pj all $ZIPSOURCE $BTARGET $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE + 410: $SOLAR_ENV_ROOT/etools/lucopy.pj all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE 415: fi 600: umask 002 800: hash -r @@ -1378,7 +1368,7 @@ unxmacxi { csh { - 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pj all $ZIPSOURCE $BTARGET $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE + 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pj all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE 600: umask 002 800: rehash 850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR @@ -1389,7 +1379,7 @@ unxmacxi sh { 400: if [ $COPYALL ]; then - 410: $SOLAR_ENV_ROOT/etools/lucopy.pj all $ZIPSOURCE $BTARGET $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE + 410: $SOLAR_ENV_ROOT/etools/lucopy.pj all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE 415: fi 600: umask 002 800: hash -r @@ -1647,7 +1637,7 @@ unxsoli4 { csh { - 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pj all $ZIPSOURCE $BTARGET $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE + 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pj all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE 600: umask 002 800: rehash 850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR @@ -1658,7 +1648,7 @@ unxsoli4 sh { 400: if [ $COPYALL ]; then - 410: $SOLAR_ENV_ROOT/etools/lucopy.pj all $ZIPSOURCE $BTARGET $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE + 410: $SOLAR_ENV_ROOT/etools/lucopy.pj all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE 415: fi 600: umask 002 800: hash -r @@ -1925,7 +1915,7 @@ unxsols4 { csh { - 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pj all $ZIPSOURCE $BTARGET $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE + 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pj all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE 600: umask 002 800: rehash 850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR @@ -1936,7 +1926,7 @@ unxsols4 sh { 400: if [ $COPYALL ]; then - 410: $SOLAR_ENV_ROOT/etools/lucopy.pj all $ZIPSOURCE $BTARGET $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE + 410: $SOLAR_ENV_ROOT/etools/lucopy.pj all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE 415: fi 600: umask 002 800: hash -r @@ -2174,7 +2164,7 @@ unxsolu4 { csh { - 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pj all $ZIPSOURCE $BTARGET $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE + 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pj all $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE 600: umask 002 800: rehash 850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR @@ -2185,7 +2175,7 @@ unxsolu4 sh { 400: if [ $COPYALL ]; then - 410: $SOLAR_ENV_ROOT/etools/lucopy.pj all $ZIPSOURCE $BTARGET $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE + 410: $SOLAR_ENV_ROOT/etools/lucopy.pj all $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE 415: fi 600: umask 002 800: hash -r @@ -2446,14 +2436,14 @@ unxubti8 { csh { - 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pj all $ZIPSOURCE $BTARGET $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE + 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pj all $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE 600: umask 002 800: rehash } sh { 400: if [ $COPYALL ]; then - 410: $SOLAR_ENV_ROOT/etools/lucopy.pj all $ZIPSOURCE $BTARGET $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE + 410: $SOLAR_ENV_ROOT/etools/lucopy.pj all $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE 415: fi 600: umask 002 800: hash -r @@ -2705,7 +2695,7 @@ wntgcci1 { 150: setenv MYENV_PATH $PATH 160: setenv PATH $SSX_PATH - 200: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/btw/perl/bin/perl $SOLAR_ENV_ROOT/etools/lucopy.pj all $ZIPSOURCE $BTARGET $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE + 200: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/btw/perl/bin/perl $SOLAR_ENV_ROOT/etools/lucopy.pj all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE 260: setenv PATH $MYENV_PATH 270: unsetenv MYENV_PATH 850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR @@ -2720,7 +2710,7 @@ wntgcci1 260: export PATH=$MYENV_PATH 270: unset MYENV_PATH 400: if [ $COPYALL ]; then - 410: $SOLAR_ENV_ROOT/btw/perl/bin/perl $SOLAR_ENV_ROOT/etools/lucopy.pj all $ZIPSOURCE $BTARGET $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE + 410: $SOLAR_ENV_ROOT/btw/perl/bin/perl $SOLAR_ENV_ROOT/etools/lucopy.pj all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE 415: fi 850: if [ "0$SO_GEN_ERROR" -eq 0 ]; then 851: export SO_GEN_ERROR @@ -3334,7 +3324,7 @@ wntmsci12 sh { 400: if [ $COPYALL ]; then - 410: perl $SOLAR_ENV_ROOT/etools/lucopy.pj all $ZIPSOURCE $BTARGET $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE + 410: perl $SOLAR_ENV_ROOT/etools/lucopy.pj all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE 415: fi 600: umask 002 800: hash -r @@ -3687,7 +3677,7 @@ wntmsci13 sh { 400: if [ $COPYALL ]; then - 410: perl $SOLAR_ENV_ROOT/etools/lucopy.pj all $ZIPSOURCE $BTARGET $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE + 410: perl $SOLAR_ENV_ROOT/etools/lucopy.pj all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE 415: fi 600: umask 002 800: hash -r -- cgit From 715a43e788bf51864cff6b84238293414c542ddc Mon Sep 17 00:00:00 2001 From: Hans-Joachim Lankenau Date: Wed, 25 Nov 2009 17:42:39 +0100 Subject: ause106: #161178# remove -stlswitch --- solenv/config/sdev300.ini | 156 ++++------------------------------------------ 1 file changed, 12 insertions(+), 144 deletions(-) (limited to 'solenv') diff --git a/solenv/config/sdev300.ini b/solenv/config/sdev300.ini index f7ffdadc2f40..3fd245b0da87 100644 --- a/solenv/config/sdev300.ini +++ b/solenv/config/sdev300.ini @@ -123,7 +123,6 @@ common ENVROOT PATH SRC_ROOT - STL_ROOT UPDATER } order common:2 common:3 pro:0 pro:1 common common:0 cwsname common:1 shell tmp crashdump maxproc hg r_only nosource @@ -466,15 +465,6 @@ unxfbsdi SOLAR_SOURCE_ROOT %SOURCE_ROOT% SOURCE_ROOT_USED TRUE } - stl:0 IF X%STL_ROOT%X != XX - { - SOLAR_STLLIBPATH %STL_ROOT%$/..$/lib - SOLAR_STLPATH %STL_ROOT% - } - stl:1 IF X%STL_ROOT%X == XX - { - SOLAR_STLPATH %SOLARVERSION%$/%INPATH%$/inc%UPDMINOREXT%$/stl - } sysbaseroot { SOLAR_SYSBASE_ROOT %SYSBASE_ROOT% @@ -489,11 +479,10 @@ unxfbsdi LOCALINI SOL_TMP SOURCE_ROOT - STL_ROOT SYSBASE_ROOT USER } - order common0 bs_sourceroot envroot:0 sourceroot:0 sysbaseroot common1 jdk14path:0 jdk15path:0 distroot:0 nativecvs cap cax compath common2 pro stl:0 stl:1 common jdk14 jdk15 debug + order common0 bs_sourceroot envroot:0 sourceroot:0 sysbaseroot common1 jdk14path:0 jdk15path:0 distroot:0 nativecvs cap cax compath common2 pro common jdk14 jdk15 debug reset { CLASSPATH @@ -554,7 +543,6 @@ unxfbsdi nativecvs STAR_NATIVECVS pro sourceroot - stl sysbaseroot } } @@ -752,15 +740,6 @@ unxlngi6 SOLAR_SOURCE_ROOT %SOURCE_ROOT% SOURCE_ROOT_USED TRUE } - stl:0 IF X%STL_ROOT%X != XX - { - SOLAR_STLLIBPATH %STL_ROOT%$/..$/lib - SOLAR_STLPATH %STL_ROOT% - } - stl:1 IF X%STL_ROOT%X == XX - { - SOLAR_STLPATH %SOLARVERSION%$/%INPATH%$/inc%UPDMINOREXT%$/stl - } sysbaseroot { SOLAR_SYSBASE_ROOT %SYSBASE_ROOT% @@ -775,11 +754,10 @@ unxlngi6 LOCALINI SOL_TMP SOURCE_ROOT - STL_ROOT SYSBASE_ROOT USER } - order common0 bs_sourceroot envroot:0 sourceroot:0 sysbaseroot common1 jdk14path:0 jdk15path:0 ojdk16path:0 distroot:0 nativecvs cap cax compath common2 pro common3:0 stl:0 stl:1 common jdk14 jdk15 ojdk16 + order common0 bs_sourceroot envroot:0 sourceroot:0 sysbaseroot common1 jdk14path:0 jdk15path:0 ojdk16path:0 distroot:0 nativecvs cap cax compath common2 pro common3:0 common jdk14 jdk15 ojdk16 reset { CLASSPATH @@ -842,7 +820,6 @@ unxlngi6 ojdk16path pro sourceroot - stl sysbaseroot } } @@ -1042,15 +1019,6 @@ unxlngx6 SOLAR_SOURCE_ROOT %SOURCE_ROOT% SOURCE_ROOT_USED TRUE } - stl:0 IF X%STL_ROOT%X != XX - { - SOLAR_STLLIBPATH %STL_ROOT%$/..$/lib - SOLAR_STLPATH %STL_ROOT% - } - stl:1 IF X%STL_ROOT%X == XX - { - SOLAR_STLPATH %SOLARVERSION%$/%INPATH%$/inc%UPDMINOREXT%$/stl - } sysbaseroot { SOLAR_SYSBASE_ROOT %SYSBASE_ROOT% @@ -1065,11 +1033,10 @@ unxlngx6 LOCALINI SOL_TMP SOURCE_ROOT - STL_ROOT SYSBASE_ROOT USER } - order common0 bs_sourceroot envroot:0 sourceroot:0 sysbaseroot common1 jdk14path:0 jdk15path:0 ojdk16path:0 distroot:0 nativecvs cap cax compath common2 common3:0 pro stl:0 stl:1 common jdk14 jdk15 ojdk16 + order common0 bs_sourceroot envroot:0 sourceroot:0 sysbaseroot common1 jdk14path:0 jdk15path:0 ojdk16path:0 distroot:0 nativecvs cap cax compath common2 common3:0 pro common jdk14 jdk15 ojdk16 reset { CLASSPATH @@ -1132,7 +1099,6 @@ unxlngx6 ojdk16path pro sourceroot - stl sysbaseroot } } @@ -1327,15 +1293,6 @@ unxmacxi SOLAR_SOURCE_ROOT %SOURCE_ROOT% SOURCE_ROOT_USED TRUE } - stl:0 IF X%STL_ROOT%X != XX - { - SOLAR_STLLIBPATH %STL_ROOT%$/..$/lib - SOLAR_STLPATH %STL_ROOT% - } - stl:1 IF X%STL_ROOT%X == XX - { - SOLAR_STLPATH %SOLARVERSION%$/%INPATH%$/inc%UPDMINOREXT%$/stl - } sysbaseroot { SOLAR_SYSBASE_ROOT %SYSBASE_ROOT% @@ -1350,11 +1307,10 @@ unxmacxi LOCALINI SOL_TMP SOURCE_ROOT - STL_ROOT SYSBASE_ROOT USER } - order common0 bs_sourceroot envroot:0 sourceroot:0 sysbaseroot common1 jdk14path:0 jdk15path:0 distroot:0 nativecvs cap cax compath common2 pro stl:0 stl:1 common jdk14 jdk15 + order common0 bs_sourceroot envroot:0 sourceroot:0 sysbaseroot common1 jdk14path:0 jdk15path:0 distroot:0 nativecvs cap cax compath common2 pro common jdk14 jdk15 reset { CLASSPATH @@ -1415,7 +1371,6 @@ unxmacxi nativecvs STAR_NATIVECVS pro sourceroot - stl sysbaseroot } } @@ -1601,15 +1556,6 @@ unxsoli4 SOLAR_SOURCE_ROOT %SOURCE_ROOT% SOURCE_ROOT_USED TRUE } - stl:0 IF X%STL_ROOT%X != XX - { - SOLAR_STLLIBPATH %STL_ROOT%$/..$/lib - SOLAR_STLPATH %STL_ROOT% - } - stl:1 IF X%STL_ROOT%X == XX - { - SOLAR_STLPATH %SOLARVERSION%$/%INPATH%$/inc%UPDMINOREXT%$/stl - } sysbaseroot { SOLAR_SYSBASE_ROOT %SYSBASE_ROOT% @@ -1624,11 +1570,10 @@ unxsoli4 LOCALINI SOL_TMP SOURCE_ROOT - STL_ROOT SYSBASE_ROOT USER } - order common0 bs_sourceroot envroot:0 sourceroot:0 common1 distroot:0 jdk14path:0 jdk15path:0 ojdk16path:0 sysbaseroot cap cax compath nativecvs common2 pro stl:1 stl:0 common jdk14 jdk15 ojdk16 + order common0 bs_sourceroot envroot:0 sourceroot:0 common1 distroot:0 jdk14path:0 jdk15path:0 ojdk16path:0 sysbaseroot cap cax compath nativecvs common2 pro common jdk14 jdk15 ojdk16 reset { CLASSPATH @@ -1685,7 +1630,6 @@ unxsoli4 ojdk16path pro sourceroot - stl sysbaseroot } } @@ -1878,15 +1822,6 @@ unxsols4 SOLAR_SOURCE_ROOT %SOURCE_ROOT% SOURCE_ROOT_USED TRUE } - stl:0 IF X%STL_ROOT%X != XX - { - SOLAR_STLLIBPATH %STL_ROOT%$/..$/lib - SOLAR_STLPATH %STL_ROOT% - } - stl:1 IF X%STL_ROOT%X == XX - { - SOLAR_STLPATH %SOLARVERSION%$/%INPATH%$/inc%UPDMINOREXT%$/stl - } sysbaseroot { SOLAR_SYSBASE_ROOT %SYSBASE_ROOT% @@ -1902,11 +1837,10 @@ unxsols4 LOCALINI SOL_TMP SOURCE_ROOT - STL_ROOT SYSBASE_ROOT USER } - order common0 bs_sourceroot envroot:0 sourceroot:0 common1 distroot:0 jdk14path:0 jdk15path:0 ojdk16path:0 sysbaseroot cap cax compath nativecvs common2 common:3 pro stl:1 stl:0 common jdk14 jdk15 ojdk16 + order common0 bs_sourceroot envroot:0 sourceroot:0 common1 distroot:0 jdk14path:0 jdk15path:0 ojdk16path:0 sysbaseroot cap cax compath nativecvs common2 common:3 pro common jdk14 jdk15 ojdk16 reset { CLASSPATH @@ -1963,7 +1897,6 @@ unxsols4 ojdk16path pro sourceroot - stl sysbaseroot } } @@ -2127,15 +2060,6 @@ unxsolu4 SOLAR_SOURCE_ROOT %SOURCE_ROOT% SOURCE_ROOT_USED TRUE } - stl:0 IF X%STL_ROOT%X != XX - { - SOLAR_STLLIBPATH %STL_ROOT%$/..$/lib - SOLAR_STLPATH %STL_ROOT% - } - stl:1 IF X%STL_ROOT%X == XX - { - SOLAR_STLPATH %SOLARVERSION%$/%INPATH%$/inc%UPDMINOREXT%$/stl - } sysbaseroot { SOLAR_SYSBASE_ROOT %SYSBASE_ROOT% @@ -2151,11 +2075,10 @@ unxsolu4 LOCALINI SOL_TMP SOURCE_ROOT - STL_ROOT SYSBASE_ROOT USER } - order common0 bs_sourceroot envroot:0 sourceroot:0 common1 distroot:0 jdk15path:0 sysbaseroot cap cax compath nativecvs common2 common:3 pro stl:1 stl:0 common jdk15 + order common0 bs_sourceroot envroot:0 sourceroot:0 common1 distroot:0 jdk15path:0 sysbaseroot cap cax compath nativecvs common2 common:3 pro common jdk15 reset { CLASSPATH @@ -2208,7 +2131,6 @@ unxsolu4 nativecvs STAR_NATIVECVS pro sourceroot - stl sysbaseroot } } @@ -2399,15 +2321,6 @@ unxubti8 SOLAR_SOURCE_ROOT %SOURCE_ROOT% SOURCE_ROOT_USED TRUE } - stl:0 IF X%STL_ROOT%X != XX - { - SOLAR_STLLIBPATH %STL_ROOT%$/..$/lib - SOLAR_STLPATH %STL_ROOT% - } - stl:1 IF X%STL_ROOT%X == XX - { - SOLAR_STLPATH %SOLARVERSION%$/%INPATH%$/inc%UPDMINOREXT%$/stl - } } extern { @@ -2418,10 +2331,9 @@ unxubti8 LOCALINI SOL_TMP SOURCE_ROOT - STL_ROOT USER } - order common0 bs_sourceroot envroot:0 sourceroot:0 common1 ojdk16path:0 distroot:0 nativecvs cap cax compath common2 pro stl:0 stl:1 common jdk15 ojdk16 debug + order common0 bs_sourceroot envroot:0 sourceroot:0 common1 ojdk16path:0 distroot:0 nativecvs cap cax compath common2 pro common jdk15 ojdk16 debug reset { CLASSPATH @@ -2660,15 +2572,6 @@ wntgcci1 SOLAR_SOURCE_ROOT %SOURCE_ROOT% SOURCE_ROOT_USED TRUE } - stl:0 IF X%STL_ROOT%X != XX - { - SOLAR_STLLIBPATH %STL_ROOT%$/..$/lib - SOLAR_STLPATH %STL_ROOT% - } - stl:1 IF X%STL_ROOT%X == XX - { - SOLAR_STLPATH %SOLARVERSION%$/%INPATH%$/inc%UPDMINOREXT%$/stl - } } extern { @@ -2679,9 +2582,8 @@ wntgcci1 LOCALINI SOL_TMP SOURCE_ROOT - STL_ROOT } - order common0 bs_sourceroot envroot:0 sourceroot:0 common1 distroot:0 cap cax psdk compath common2 jdk14path:0 jdk15path:0 stl:1 stl:0 common jdk14 jdk15 + order common0 bs_sourceroot envroot:0 sourceroot:0 common1 distroot:0 cap cax psdk compath common2 jdk14path:0 jdk15path:0 common jdk14 jdk15 reset { COPYALL @@ -2744,7 +2646,6 @@ wntgcci1 psdk STAR_PSDK shell STAR_USE_SHELL sourceroot - stl } } wntmsci11 @@ -2951,15 +2852,6 @@ wntmsci11 SOLAR_SOURCE_ROOT %SOURCE_ROOT% SOURCE_ROOT_USED TRUE } - stl:0 IF X%STL_ROOT%X != XX - { - SOLAR_STLLIBPATH %STL_ROOT%$/..$/lib - SOLAR_STLPATH %STL_ROOT% - } - stl:1 IF X%STL_ROOT%X == XX - { - SOLAR_STLPATH %SOLARVERSION%$/%INPATH%$/inc%UPDMINOREXT%$/stl - } } extern { @@ -2970,9 +2862,8 @@ wntmsci11 LOCALINI SOL_TMP SOURCE_ROOT - STL_ROOT } - order common0 bs_sourceroot envroot:0 sourceroot:0 common1 distroot:0 cap cax psdk compath common2 jdk14path:0 jdk15path:0 stl:1 stl:0 common jdk14 jdk15 + order common0 bs_sourceroot envroot:0 sourceroot:0 common1 distroot:0 cap cax psdk compath common2 jdk14path:0 jdk15path:0 common jdk14 jdk15 reset { COPYALL @@ -3010,7 +2901,6 @@ wntmsci11 psdk STAR_PSDK shell STAR_USE_SHELL sourceroot - stl } } wntmsci12 @@ -3272,15 +3162,6 @@ wntmsci12 SOLAR_SOURCE_ROOT $dp(%SOURCE_ROOT%) SOURCE_ROOT_USED TRUE } - stl:0 IF X%STL_ROOT%X != XX - { - SOLAR_STLLIBPATH $dp(%STL_ROOT%$/..$/lib) - SOLAR_STLPATH $dp(%STL_ROOT%) - } - stl:1 IF X%STL_ROOT%X == XX - { - SOLAR_STLPATH %SOLARVERSION%$/%INPATH%$/inc%UPDMINOREXT%$/stl - } tmp { SOL_TMP $dp(%SOL_TMP_DIR%) @@ -3296,11 +3177,10 @@ wntmsci12 OSTYPE $dp(SOL_TMP) $dp(SOURCE_ROOT) - $dp(STL_ROOT) $dp(TMP) $dp(TEMP) } - order common0 bs_sourceroot tmp envroot:0 sourceroot:0 pro common1 distroot:0 cap cax common02 psdk compath common2 common:3 jdk14path:0 jdk15path:0 ojdk16path:0 stl:1 stl:0 common jdk14 jdk15 ojdk16 + order common0 bs_sourceroot tmp envroot:0 sourceroot:0 pro common1 distroot:0 cap cax common02 psdk compath common2 common:3 jdk14path:0 jdk15path:0 ojdk16path:0 common jdk14 jdk15 ojdk16 reset { COPYALL @@ -3362,7 +3242,6 @@ wntmsci12 psdk STAR_PSDK shell STAR_USE_SHELL sourceroot - stl tmp SOL_TMP_DIR } } @@ -3625,15 +3504,6 @@ wntmsci13 SOLAR_SOURCE_ROOT $dp(%SOURCE_ROOT%) SOURCE_ROOT_USED TRUE } - stl:0 IF X%STL_ROOT%X != XX - { - SOLAR_STLLIBPATH $dp(%STL_ROOT%$/..$/lib) - SOLAR_STLPATH $dp(%STL_ROOT%) - } - stl:1 IF X%STL_ROOT%X == XX - { - SOLAR_STLPATH %SOLARVERSION%$/%INPATH%$/inc%UPDMINOREXT%$/stl - } tmp { SOL_TMP $dp(%SOL_TMP_DIR%) @@ -3649,11 +3519,10 @@ wntmsci13 OSTYPE $dp(SOL_TMP) $dp(SOURCE_ROOT) - $dp(STL_ROOT) $dp(TMP) $dp(TEMP) } - order common0 bs_sourceroot tmp envroot:0 sourceroot:0 pro common1 distroot:0 cap cax common02 psdk compath common2 common:3 jdk14path:0 jdk15path:0 ojdk16path:0 stl:1 stl:0 common jdk14 jdk15 ojdk16 + order common0 bs_sourceroot tmp envroot:0 sourceroot:0 pro common1 distroot:0 cap cax common02 psdk compath common2 common:3 jdk14path:0 jdk15path:0 ojdk16path:0 common jdk14 jdk15 ojdk16 reset { COPYALL @@ -3715,7 +3584,6 @@ wntmsci13 psdk STAR_PSDK shell STAR_USE_SHELL sourceroot - stl tmp SOL_TMP_DIR } } -- cgit From cdd33f7743ac125198f886dc829602216879d535 Mon Sep 17 00:00:00 2001 From: Hans-Joachim Lankenau Date: Wed, 25 Nov 2009 17:56:43 +0100 Subject: ause106: #161178# remove -nativecvs switch --- solenv/config/sdev300.ini | 56 +++++++---------------------------------------- 1 file changed, 8 insertions(+), 48 deletions(-) (limited to 'solenv') diff --git a/solenv/config/sdev300.ini b/solenv/config/sdev300.ini index 3fd245b0da87..9f072346bc01 100644 --- a/solenv/config/sdev300.ini +++ b/solenv/config/sdev300.ini @@ -452,10 +452,6 @@ unxfbsdi { SOLAR_JDK15PATH %JDK_PATH% } - nativecvs - { - *cvs %STAR_NATIVECVS% - } pro { PROSWITCH -DPRODUCT @@ -482,7 +478,7 @@ unxfbsdi SYSBASE_ROOT USER } - order common0 bs_sourceroot envroot:0 sourceroot:0 sysbaseroot common1 jdk14path:0 jdk15path:0 distroot:0 nativecvs cap cax compath common2 pro common jdk14 jdk15 debug + order common0 bs_sourceroot envroot:0 sourceroot:0 sysbaseroot common1 jdk14path:0 jdk15path:0 distroot:0 cap cax compath common2 pro common jdk14 jdk15 debug reset { CLASSPATH @@ -540,7 +536,6 @@ unxfbsdi jdk15 jdk15path l10n L10N_framework - nativecvs STAR_NATIVECVS pro sourceroot sysbaseroot @@ -712,10 +707,6 @@ unxlngi6 { SOLAR_JDK15PATH %JDK_PATH% } - nativecvs - { - *cvs %STAR_NATIVECVS% - } ojdk16 { JAVA_HOME %OJDK16PATH% @@ -757,7 +748,7 @@ unxlngi6 SYSBASE_ROOT USER } - order common0 bs_sourceroot envroot:0 sourceroot:0 sysbaseroot common1 jdk14path:0 jdk15path:0 ojdk16path:0 distroot:0 nativecvs cap cax compath common2 pro common3:0 common jdk14 jdk15 ojdk16 + order common0 bs_sourceroot envroot:0 sourceroot:0 sysbaseroot common1 jdk14path:0 jdk15path:0 ojdk16path:0 distroot:0 cap cax compath common2 pro common3:0 common jdk14 jdk15 ojdk16 reset { CLASSPATH @@ -815,7 +806,6 @@ unxlngi6 jdk15 jdk15path l10n L10N_framework - nativecvs STAR_NATIVECVS ojdk16 ojdk16path pro @@ -991,10 +981,6 @@ unxlngx6 { SOLAR_JDK15PATH %JDK_PATH% } - nativecvs - { - *cvs %STAR_NATIVECVS% - } ojdk16 { JAVA_HOME %OJDK16PATH% @@ -1036,7 +1022,7 @@ unxlngx6 SYSBASE_ROOT USER } - order common0 bs_sourceroot envroot:0 sourceroot:0 sysbaseroot common1 jdk14path:0 jdk15path:0 ojdk16path:0 distroot:0 nativecvs cap cax compath common2 common3:0 pro common jdk14 jdk15 ojdk16 + order common0 bs_sourceroot envroot:0 sourceroot:0 sysbaseroot common1 jdk14path:0 jdk15path:0 ojdk16path:0 distroot:0 cap cax compath common2 common3:0 pro common jdk14 jdk15 ojdk16 reset { CLASSPATH @@ -1094,7 +1080,6 @@ unxlngx6 jdk15 jdk15path l10n L10N_framework - nativecvs STAR_NATIVECVS ojdk16 ojdk16path pro @@ -1280,10 +1265,6 @@ unxmacxi { SOLAR_JDK15PATH %JDK_PATH% } - nativecvs - { - *cvs %STAR_NATIVECVS% - } pro { PROSWITCH -DPRODUCT @@ -1310,7 +1291,7 @@ unxmacxi SYSBASE_ROOT USER } - order common0 bs_sourceroot envroot:0 sourceroot:0 sysbaseroot common1 jdk14path:0 jdk15path:0 distroot:0 nativecvs cap cax compath common2 pro common jdk14 jdk15 + order common0 bs_sourceroot envroot:0 sourceroot:0 sysbaseroot common1 jdk14path:0 jdk15path:0 distroot:0 cap cax compath common2 pro common jdk14 jdk15 reset { CLASSPATH @@ -1368,7 +1349,6 @@ unxmacxi jdk15 jdk15path l10n L10N_framework - nativecvs STAR_NATIVECVS pro sourceroot sysbaseroot @@ -1528,10 +1508,6 @@ unxsoli4 { SOLAR_JDK15PATH %JDK_PATH% } - nativecvs - { - *cvs %STAR_NATIVECVS% - } ojdk16 { JAVA_HOME %OJDK16PATH% @@ -1573,7 +1549,7 @@ unxsoli4 SYSBASE_ROOT USER } - order common0 bs_sourceroot envroot:0 sourceroot:0 common1 distroot:0 jdk14path:0 jdk15path:0 ojdk16path:0 sysbaseroot cap cax compath nativecvs common2 pro common jdk14 jdk15 ojdk16 + order common0 bs_sourceroot envroot:0 sourceroot:0 common1 distroot:0 jdk14path:0 jdk15path:0 ojdk16path:0 sysbaseroot cap cax compath common2 pro common jdk14 jdk15 ojdk16 reset { CLASSPATH @@ -1625,7 +1601,6 @@ unxsoli4 jdk15 jdk15path l10n L10N_framework - nativecvs STAR_NATIVECVS ojdk16 ojdk16path pro @@ -1794,10 +1769,6 @@ unxsols4 { SOLAR_JDK15PATH %JDK_PATH% } - nativecvs - { - *cvs %STAR_NATIVECVS% - } ojdk16 { JAVA_HOME %OJDK16PATH% @@ -1840,7 +1811,7 @@ unxsols4 SYSBASE_ROOT USER } - order common0 bs_sourceroot envroot:0 sourceroot:0 common1 distroot:0 jdk14path:0 jdk15path:0 ojdk16path:0 sysbaseroot cap cax compath nativecvs common2 common:3 pro common jdk14 jdk15 ojdk16 + order common0 bs_sourceroot envroot:0 sourceroot:0 common1 distroot:0 jdk14path:0 jdk15path:0 ojdk16path:0 sysbaseroot cap cax compath common2 common:3 pro common jdk14 jdk15 ojdk16 reset { CLASSPATH @@ -1892,7 +1863,6 @@ unxsols4 jdk15 jdk15path l10n L10N_framework - nativecvs STAR_NATIVECVS ojdk16 ojdk16path pro @@ -2047,10 +2017,6 @@ unxsolu4 { SOLAR_JDK15PATH %JDK_PATH% } - nativecvs - { - *cvs %STAR_NATIVECVS% - } pro { PROSWITCH -DPRODUCT @@ -2078,7 +2044,7 @@ unxsolu4 SYSBASE_ROOT USER } - order common0 bs_sourceroot envroot:0 sourceroot:0 common1 distroot:0 jdk15path:0 sysbaseroot cap cax compath nativecvs common2 common:3 pro common jdk15 + order common0 bs_sourceroot envroot:0 sourceroot:0 common1 distroot:0 jdk15path:0 sysbaseroot cap cax compath common2 common:3 pro common jdk15 reset { CLASSPATH @@ -2128,7 +2094,6 @@ unxsolu4 jdk15 jdk15path l10n L10N_framework - nativecvs STAR_NATIVECVS pro sourceroot sysbaseroot @@ -2290,10 +2255,6 @@ unxubti8 { SOLAR_JDK15PATH %JDK_PATH% } - nativecvs - { - *cvs %STAR_NATIVECVS% - } ojdk16 { JAVA_HOME %OJDK16PATH% @@ -2333,7 +2294,7 @@ unxubti8 SOURCE_ROOT USER } - order common0 bs_sourceroot envroot:0 sourceroot:0 common1 ojdk16path:0 distroot:0 nativecvs cap cax compath common2 pro common jdk15 ojdk16 debug + order common0 bs_sourceroot envroot:0 sourceroot:0 common1 ojdk16path:0 distroot:0 cap cax compath common2 pro common jdk15 ojdk16 debug reset { CLASSPATH @@ -2373,7 +2334,6 @@ unxubti8 envroot jdk15 l10n L10N_framework - nativecvs STAR_NATIVECVS ojdk16 ojdk16path pro -- cgit From 542f65ad5298bdc4f6e5325941ee30d18cb56e94 Mon Sep 17 00:00:00 2001 From: Hans-Joachim Lankenau Date: Fri, 27 Nov 2009 18:46:15 +0100 Subject: ause106: #161178# fix syntax --- solenv/inc/settings.mk | 3 +++ 1 file changed, 3 insertions(+) (limited to 'solenv') diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk index d2c77abd1394..8accdb769799 100644 --- a/solenv/inc/settings.mk +++ b/solenv/inc/settings.mk @@ -752,6 +752,9 @@ INCLOCPRJ=$(foreach,i,$(PRJINC) $i/inc) INCDEPN+=$(INCLOCPRJ) .ENDIF .IF "$(INCPRE)"!="" +INCDEPN+=$(INCPRE) +.ENDIF + # Resource-Pfad fuer .SRS .IF "$(common_build_srs)"!="" -- cgit From 7d18f7dea1de9cabd4d681c991fe6f8c92e8af38 Mon Sep 17 00:00:00 2001 From: Hans-Joachim Lankenau Date: Mon, 30 Nov 2009 12:09:40 +0100 Subject: #161178# SHL3DLLpre is now SHL4DLLPRE as before --- solenv/inc/target.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'solenv') diff --git a/solenv/inc/target.mk b/solenv/inc/target.mk index 24d95883f16b..2330aa64e49b 100644 --- a/solenv/inc/target.mk +++ b/solenv/inc/target.mk @@ -580,7 +580,7 @@ SHL3BASEX=/BASE:$(SHL3BASE) .IF "$(WINVERSIONNAMES)"!="" SHL4TARGET!:=$(SHL4TARGET)$($(WINVERSIONNAMES)_MAJOR) .ENDIF # "$(WINVERSIONNAMES)"!="" -SHL4DLLpre*=$(DLLPRE) +SHL4DLLPRE*=$(DLLPRE) SHL4TARGETN=$(DLLDEST)/$(SHL4DLLPRE)$(SHL4TARGET)$(DLLPOST) .IF "$(BASE)" != "" .IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2" -- cgit From 09e7bc37bdd9a750652dc6a724905c5ee341e5cc Mon Sep 17 00:00:00 2001 From: Joachim Lingner Date: Mon, 30 Nov 2009 13:50:49 +0100 Subject: jl144: #i106132# nss does not build on MacOS 10.6 because of libsqlite3 --- solenv/inc/unxmacxi.mk | 1 - 1 file changed, 1 deletion(-) (limited to 'solenv') diff --git a/solenv/inc/unxmacxi.mk b/solenv/inc/unxmacxi.mk index 6d27121366e5..09d5d424b690 100644 --- a/solenv/inc/unxmacxi.mk +++ b/solenv/inc/unxmacxi.mk @@ -55,7 +55,6 @@ CFLAGSENABLESYMBOLS=-g .IF "$(SNOW_LEOPARD_10_4)"!="" JAVACOMPILER+=-target 1.5 -DYLD_INSERT_LIBRARIES=/usr/lib/libsqlite3.dylib .EXPORT: DYLD_INSERT_LIBRARIES .ENDIF # "$(SNOW_LEOPARD_10_4)"!="" -- cgit From 0dca6e895fd120809d68bedabd6abfd2409df64c Mon Sep 17 00:00:00 2001 From: "Philipp Lohmann [pl]" Date: Thu, 3 Dec 2009 14:19:56 +0100 Subject: d2v02: #161005# use X11 link dependency only where really required --- solenv/inc/unxlng.mk | 6 ++++-- solenv/inc/unxsoli4.mk | 2 +- solenv/inc/unxsols4.mk | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) (limited to 'solenv') diff --git a/solenv/inc/unxlng.mk b/solenv/inc/unxlng.mk index a79d3e47c6cf..6f44a784edcc 100644 --- a/solenv/inc/unxlng.mk +++ b/solenv/inc/unxlng.mk @@ -208,12 +208,14 @@ LINKFLAGS += -Wl,-zdynsort .ENDIF # libraries for linking applications -STDLIBGUIMT+=-Wl,--as-needed -lX11 -ldl -lpthread -lm -Wl,--no-as-needed +STDLIBGUIMT+=-Wl,--as-needed -ldl -lpthread -lm -Wl,--no-as-needed STDLIBCUIMT+=-Wl,--as-needed -ldl -lpthread -lm -Wl,--no-as-needed # libraries for linking shared libraries -STDSHLGUIMT+=-Wl,--as-needed -lX11 -lXext -ldl -lpthread -lm -Wl,--no-as-needed +STDSHLGUIMT+=-Wl,--as-needed -ldl -lpthread -lm -Wl,--no-as-needed STDSHLCUIMT+=-Wl,--as-needed -ldl -lpthread -lm -Wl,--no-as-needed +X11LINK_DYNAMIC = -Wl,--as-needed -lXext -lX11 -Wl,--no-as-needed + LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive .IF "$(USE_STLP_DEBUG)" != "" diff --git a/solenv/inc/unxsoli4.mk b/solenv/inc/unxsoli4.mk index afcea59a9971..c4c777376561 100644 --- a/solenv/inc/unxsoli4.mk +++ b/solenv/inc/unxsoli4.mk @@ -199,7 +199,7 @@ STDSHLCUIMT=$(DYNAMIC) -lpthread CPPRUNTIME -lm -lc # libdl.so - no really an GUI library but required in this context STDLIBGUIMT+=-ldl STDSHLGUIMT+=-ldl -X11LINK_DYNAMIC = -lX11 +X11LINK_DYNAMIC = -lXext -lX11 # @@@ interposer needed for -Bdirect @@@ # LIBSALCPPRT*=-z allextract -lsalcpprt -z defaultextract diff --git a/solenv/inc/unxsols4.mk b/solenv/inc/unxsols4.mk index a28b097e13b4..67bafa3a1c14 100644 --- a/solenv/inc/unxsols4.mk +++ b/solenv/inc/unxsols4.mk @@ -205,7 +205,7 @@ STDSHLCUIMT=$(DYNAMIC) -lpthread CPPRUNTIME -lm -lc # libdl.so - no really an GUI library but required in this context STDLIBGUIMT+=-ldl STDSHLGUIMT+=-ldl -X11LINK_DYNAMIC = -lX11 +X11LINK_DYNAMIC = -lXext -lX11 # @@@ interposer needed for -Bdirect @@@ # LIBSALCPPRT*=-z allextract -lsalcpprt -z defaultextract -- cgit From ded4d5f4e9bd896bf05373756d7834f1ebc647ce Mon Sep 17 00:00:00 2001 From: Martin Hollmichel Date: Tue, 8 Dec 2009 15:58:00 +0000 Subject: update: year of copyright --- solenv/inc/shlinfo.rc | 2 +- solenv/inc/version.hrc | 4 ++-- solenv/inc/version_so.hrc | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'solenv') diff --git a/solenv/inc/shlinfo.rc b/solenv/inc/shlinfo.rc index 07853e84862e..c114458617de 100644 --- a/solenv/inc/shlinfo.rc +++ b/solenv/inc/shlinfo.rc @@ -29,7 +29,7 @@ #define LG_D // generate always german version #endif -#define VER_FIRSTYEAR 2008 +#define VER_FIRSTYEAR 2010 #if defined(OS2) diff --git a/solenv/inc/version.hrc b/solenv/inc/version.hrc index 6de6b3c99763..048b59205e08 100644 --- a/solenv/inc/version.hrc +++ b/solenv/inc/version.hrc @@ -38,8 +38,8 @@ #define VER_FINAL 0 #define VER_DAY 1 -#define VER_MONTH 9 -#define VER_YEAR 2009 +#define VER_MONTH 1 +#define VER_YEAR 2010 #ifndef VER_FIRSTYEAR #define VER_FIRSTYEAR VER_YEAR diff --git a/solenv/inc/version_so.hrc b/solenv/inc/version_so.hrc index 6eb9a183d6bd..852af90168b0 100644 --- a/solenv/inc/version_so.hrc +++ b/solenv/inc/version_so.hrc @@ -38,8 +38,8 @@ #define VER_FINAL 0 #define VER_DAY 1 -#define VER_MONTH 9 -#define VER_YEAR 2009 +#define VER_MONTH 1 +#define VER_YEAR 2010 #ifndef VER_FIRSTYEAR #define VER_FIRSTYEAR VER_YEAR -- cgit From 268ea4e63f4024544cbd33e0e6d95cb3119746b7 Mon Sep 17 00:00:00 2001 From: Hans-Joachim Lankenau Date: Thu, 10 Dec 2009 15:53:30 +0100 Subject: aus111: #i107498# - xhp localization outside helpcontent2 and the according cleanup in sdext --- solenv/inc/tg_help.mk | 86 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 86 insertions(+) create mode 100755 solenv/inc/tg_help.mk (limited to 'solenv') diff --git a/solenv/inc/tg_help.mk b/solenv/inc/tg_help.mk new file mode 100755 index 000000000000..a8a33051f0fc --- /dev/null +++ b/solenv/inc/tg_help.mk @@ -0,0 +1,86 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2008 by Sun Microsystems, Inc. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# $RCSfile: makefile.pmk,v $ +# +# $Revision: 1.25 $ +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +# to make it usable with special lang selection of +# helpcontent2 + +aux_alllangiso*:=$(alllangiso) + +SHELL_PACKAGE:=$(subst,/,$/ $(PACKAGE)) +HLANGXHPFILES:=$(foreach,i,$(XHPFILES) $(foreach,j,$(aux_alllangiso) $(COMMONMISC)$/$j$/$(SHELL_PACKAGE)$/$(i:f))) + +ALLTAR : $(COMMONMISC)$/$(TARGET).done $(COMMONMISC)$/xhp_changed.flag optix + +$(HLANGXHPFILES) : $$(@:d)thisdir.created + +$(COMMONMISC)$/{$(aux_alllangiso)}$/$(SHELL_PACKAGE)$/%.xhp :| %.xhp + @$(TOUCH) $@ +# internal dependencies not sufficient to trigger merge? +# @$(NULL) + + +$(COMMONMISC)$/$(TARGET).done : $(HLANGXHPFILES) +.IF "$(WITH_LANG)"!="" + $(AUGMENT_LIBRARY_PATH) $(HELPEX) -QQ -p $(PRJNAME) -r $(PRJ) -i @$(mktmp $(uniq $(foreach,i,$? $(!eq,$(i:f),$(i:f:s/.xhp//) $(i:f) $(XHPFILES))))) -x $(COMMONMISC) -y $(SHELL_PACKAGE) -l all -lf $(aux_alllangiso:t",") -m $(LOCALIZESDF) && $(TOUCH) $@ +.ELSE # "$(WITH_LANG)"!="" + cp $(uniq $(foreach,i,$? $(!eq,$(i:f),$(i:f:s/.xhp//) $(i:f) $(XHPFILES)))) $(COMMONMISC)$/en-US$/$(SHELL_PACKAGE) && $(TOUCH) $@ +.ENDIF # "$(WITH_LANG)"!="" +.IF "$(OS)"=="SOLARIS" + @$(ECHONL) " " +.ELSE # "$(OS)"=="SOLARIS" + @$(ECHONL) +.ENDIF # "$(OS)"=="SOLARIS" + +$(COMMONMISC)$/xhp_changed.flag : $(HLANGXHPFILES) + @$(TOUCH) $@ + +# urks - dmake mixes up operators and strings :-( +.IF "$(HLANGXHPFILES:s/defined/xxx/)"!="" + +.IF "$(HELPTRANSPHONY)"!="" +$(COMMONMISC)$/$(TARGET).done .PHONY : +.ELSE # "$(HELPTRANSPHONY)"!="" + +$(COMMONMISC)$/$(TARGET).done : makefile.mk +.IF "$(WITH_LANG)"!="" +$(COMMONMISC)$/$(TARGET).done : $(LOCALIZESDF) +.ENDIF # "$(WITH_LANG)"!="" +.ENDIF # "$(HELPTRANSPHONY)"!="" +.ENDIF # "$(HLANGXHPFILES)"!="" + +optix: $(COMMONMISC)$/$(TARGET).done + @echo done + +%.created : + @@-$(MKDIRHIER) $(@:d) + @$(TOUCH) $@ + + -- cgit From 8464add3add803b619430471083ac96ba60b2c6d Mon Sep 17 00:00:00 2001 From: sb Date: Fri, 11 Dec 2009 13:18:55 +0100 Subject: sb116: #i105348#, #i105059# put PTHREAD_CFLAGS and PYTHONPATH back into solenv/config/ssolar.cmn reset section --- solenv/config/ssolar.cmn | 2 ++ 1 file changed, 2 insertions(+) (limited to 'solenv') diff --git a/solenv/config/ssolar.cmn b/solenv/config/ssolar.cmn index 71629f1e44e6..877d82e566a5 100644 --- a/solenv/config/ssolar.cmn +++ b/solenv/config/ssolar.cmn @@ -170,6 +170,7 @@ common PROFILE profile PROSWITCH + PTHREAD_CFLAGS REMOTE_BUILD_FLAG RES_ARAB RES_CHINSIM @@ -269,6 +270,7 @@ common NO_HIDS PAM_LINK PAM + PYTHONPATH SOLAR_PLUGIN URE_BOOTSTRAP USE_FT_EMBOLDEN -- cgit From 93c0d945f7cc0bb289a364b214c91915ac23090c Mon Sep 17 00:00:00 2001 From: Release Engineering Date: Tue, 15 Dec 2009 15:44:59 +0100 Subject: DEV300 --- solenv/inc/minor.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'solenv') diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk index a7c1a50e911b..b27b78230620 100644 --- a/solenv/inc/minor.mk +++ b/solenv/inc/minor.mk @@ -1,5 +1,5 @@ RSCVERSION=300 -RSCREVISION=300m67(Build:9466) -BUILD=9466 -LAST_MINOR=m67 +RSCREVISION=300m68(Build:9474) +BUILD=9474 +LAST_MINOR=m68 SOURCEVERSION=DEV300 -- cgit From 2be04fff7b9d51a3f1cf61ddb9cd76286b48b375 Mon Sep 17 00:00:00 2001 From: Vladimir Glazunov Date: Thu, 17 Dec 2009 17:08:37 +0100 Subject: #i10000# more accurate error message --- solenv/bin/deliver.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'solenv') diff --git a/solenv/bin/deliver.pl b/solenv/bin/deliver.pl index d4d6c9c0bf5a..0d6c8b27afa4 100755 --- a/solenv/bin/deliver.pl +++ b/solenv/bin/deliver.pl @@ -552,7 +552,7 @@ sub get_base } if ( $#field == -1 ) { - print_error("can't determine module"); + print_error("can't find d.lst"); exit(2); } else { -- cgit From 2a7c61c18e01f66d9020375e3fdd66572ea1eb36 Mon Sep 17 00:00:00 2001 From: Release Engineering Date: Tue, 5 Jan 2010 16:57:53 +0100 Subject: DEV300 --- solenv/inc/minor.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'solenv') diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk index b27b78230620..74248a6e8cd7 100644 --- a/solenv/inc/minor.mk +++ b/solenv/inc/minor.mk @@ -1,5 +1,5 @@ RSCVERSION=300 -RSCREVISION=300m68(Build:9474) -BUILD=9474 -LAST_MINOR=m68 +RSCREVISION=300m69(Build:9475) +BUILD=9475 +LAST_MINOR=m69 SOURCEVERSION=DEV300 -- cgit From 033861b6808fe6123a033f4fe4586bbe6a91e21c Mon Sep 17 00:00:00 2001 From: Thomas Lange Date: Thu, 7 Jan 2010 10:48:43 +0000 Subject: #i101887# adding romanian to the list of supported locales --- solenv/inc/postset.mk | 1 + 1 file changed, 1 insertion(+) (limited to 'solenv') diff --git a/solenv/inc/postset.mk b/solenv/inc/postset.mk index 30bb91599903..4a7f6aeae28c 100644 --- a/solenv/inc/postset.mk +++ b/solenv/inc/postset.mk @@ -114,6 +114,7 @@ pl \ ps \ pt \ pt-BR \ +ro \ ru \ rw \ sat \ -- cgit From 3406b75aaec59100b015b9bcd2efe303f2a2f78b Mon Sep 17 00:00:00 2001 From: Release Engineering Date: Mon, 18 Jan 2010 13:12:51 +0100 Subject: DEV300 --- solenv/inc/minor.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'solenv') diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk index 74248a6e8cd7..c81283b50ebb 100644 --- a/solenv/inc/minor.mk +++ b/solenv/inc/minor.mk @@ -1,5 +1,5 @@ RSCVERSION=300 -RSCREVISION=300m69(Build:9475) -BUILD=9475 -LAST_MINOR=m69 +RSCREVISION=300m70(Build:9478) +BUILD=9478 +LAST_MINOR=m70 SOURCEVERSION=DEV300 -- cgit