strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chart52: merge with DEV300_m99

Browse source
This commit is contained in:
Ingrid Halama [iha] 2011-02-03 12:49:56 +01:00
commit 8ad089b251
14 changed files with 17497 additions and 10515 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27815
configure vendored
View file

File diff suppressed because one or more lines are too long

4
ooo.lst
View file

@ -1,4 +1,5 @@
http://hg.services.openoffice.org/binaries
48a9f787f43a09c0a9b7b00cd1fddbbf-hyphen-2.7.1.tar.gz
63ddc5116488985e820075e65fbe6aa4-openssl-0.9.8o.tar.gz
09357cc74975b01714e00c5899ea1881-pixman-0.12.0.tar.gz
0b49ede71c21c0599b0cc19b353a6cb3-README_apache-commons.txt
@ -40,12 +41,10 @@ a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
abc405d0bdd3ee22782d7aa20e440f08-zlib-1.1.4.tar.gz
ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip
af3c3acf618de6108d65fcdc92b492e1-commons-codec-1.3-src.tar.gz
ba1015b59c112d44d7797b62fe7bee51-neon-0.29.3.tar.gz
bc702168a2af16869201dbe91e46ae48-LICENSE_Python-2.6.1
c441926f3a552ed3e5b274b62e86af16-STLport-4.0.tar.gz
ca66e26082cab8bb817185a116db809b-redland-1.0.8.tar.gz
cd5997284f4ba1e8dde5d1e5869fc342-libwpd-0.8.8.tar.gz
d0b5af6e408b8d2958f3d83b5244f5e8-hyphen-2.4.tar.gz
d1a3205871c3c52e8a50c9f18510ae12-libformula.zip
d35724900f6a4105550293686688bbb3-silgraphite-2.3.1.tar.gz
d4c4d91ab3a8e52a2e69d48d34ef4df4-core.zip
@ -75,3 +74,4 @@ db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
ff369e69ef0f0143beb5626164e87ae2-neon-0.29.5.tar.gz

2
scp2/source/ooo/file_library_ooo.scp
View file

@ -236,8 +236,6 @@ STD_LIB_FILE( gid_File_Lib_Sdbt, sdbt)
STD_LIB_FILE( gid_File_Lib_Dbmm, dbmm)
STD_LIB_FILE( gid_File_Lib_Dbacfg, dbacfg)
STD_LIB_FILE( gid_File_Lib_Dbase2, dbase )
STD_LIB_FILE( gid_File_Lib_Dbfile , file)

11
scp2/source/ooo/file_ooo.scp
View file

@ -926,9 +926,16 @@ File gid_File_Lm_Scots_Gaelic
Styles = (PACKED);
End
File gid_File_Lm_Serbian_Ascii
File gid_File_Lm_Serbian
TXT_FILE_BODY;
Name = "serbian_ascii.lm";
Name = "serbian.lm";
Dir = gid_Dir_Share_Fingerprint;
Styles = (PACKED);
End
File gid_File_Lm_Serbian_Latin
TXT_FILE_BODY;
Name = "serbian-latin.lm";
Dir = gid_Dir_Share_Fingerprint;
Styles = (PACKED);
End

4
scp2/source/ooo/module_hidden_ooo.scp
View file

@ -168,7 +168,6 @@ Module gid_Module_Root_Files_4
gid_File_Lib_Sdbt,
gid_File_Lib_Dbmm,
gid_File_Lib_Dba,
gid_File_Lib_Dbacfg,
gid_File_Lib_Dbase2,
gid_File_Lib_Dbaxml,
gid_File_Lib_Dbt,
@ -594,7 +593,8 @@ Module gid_Module_Root_Files_6
gid_File_Lm_Sanskrit,
gid_File_Lm_Scots,
gid_File_Lm_Scots_Gaelic,
gid_File_Lm_Serbian_Ascii,
gid_File_Lm_Serbian,
gid_File_Lm_Serbian_Latin,
gid_File_Lm_Slovak_Ascii,
gid_File_Lm_Slovenian,
gid_File_Lm_Spanish,

60
solenv/inc/_tg_rslb.mk Normal file → Executable file
View file

@ -15,7 +15,8 @@ $(RSC_MULTI1) : \
-fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB1NAME)$i.res} \
$(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB1IMAGES)) -lip={$j}/$i \
-lip={$j} ) \
-lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \
-lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res \
-lip=$(SOLARSRC)/$(RSCDEFIMG)/$i -lip=$(SOLARSRC)/$(RSCDEFIMG) ) \
-subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \
-subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \
-oil={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \
@ -30,7 +31,8 @@ $(RSC_MULTI1) : \
-fs={$(BIN)/$(RESLIB1NAME)$i.res} \
$(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB1IMAGES)) -lip={$j}/$i \
-lip={$j} ) \
-lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \
-lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res \
-lip=$(SOLARSRC)/$(RSCDEFIMG)/$i -lip=$(SOLARSRC)/$(RSCDEFIMG) ) \
-subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \
-subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \
-oil=$(BIN) \
@ -76,7 +78,8 @@ $(RSC_MULTI2) : \
-fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB2NAME)$i.res} \
$(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB2IMAGES)) -lip={$j}/$i \
-lip={$j} ) \
-lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \
-lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res \
-lip=$(SOLARSRC)/$(RSCDEFIMG)/$i -lip=$(SOLARSRC)/$(RSCDEFIMG) ) \
-subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \
-subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \
-oil={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \
@ -91,7 +94,8 @@ $(RSC_MULTI2) : \
-fs={$(BIN)/$(RESLIB2NAME)$i.res} \
$(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB2IMAGES)) -lip={$j}/$i \
-lip={$j} ) \
-lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \
-lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res \
-lip=$(SOLARSRC)/$(RSCDEFIMG)/$i -lip=$(SOLARSRC)/$(RSCDEFIMG) ) \
-subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \
-subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \
-oil=$(BIN) \
@ -137,7 +141,8 @@ $(RSC_MULTI3) : \
-fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB3NAME)$i.res} \
$(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB3IMAGES)) -lip={$j}/$i \
-lip={$j} ) \
-lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \
-lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res \
-lip=$(SOLARSRC)/$(RSCDEFIMG)/$i -lip=$(SOLARSRC)/$(RSCDEFIMG) ) \
-subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \
-subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \
-oil={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \
@ -152,7 +157,8 @@ $(RSC_MULTI3) : \
-fs={$(BIN)/$(RESLIB3NAME)$i.res} \
$(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB3IMAGES)) -lip={$j}/$i \
-lip={$j} ) \
-lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \
-lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res \
-lip=$(SOLARSRC)/$(RSCDEFIMG)/$i -lip=$(SOLARSRC)/$(RSCDEFIMG) ) \
-subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \
-subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \
-oil=$(BIN) \
@ -198,7 +204,8 @@ $(RSC_MULTI4) : \
-fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB4NAME)$i.res} \
$(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB4IMAGES)) -lip={$j}/$i \
-lip={$j} ) \
-lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \
-lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res \
-lip=$(SOLARSRC)/$(RSCDEFIMG)/$i -lip=$(SOLARSRC)/$(RSCDEFIMG) ) \
-subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \
-subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \
-oil={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \
@ -213,7 +220,8 @@ $(RSC_MULTI4) : \
-fs={$(BIN)/$(RESLIB4NAME)$i.res} \
$(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB4IMAGES)) -lip={$j}/$i \
-lip={$j} ) \
-lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \
-lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res \
-lip=$(SOLARSRC)/$(RSCDEFIMG)/$i -lip=$(SOLARSRC)/$(RSCDEFIMG) ) \
-subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \
-subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \
-oil=$(BIN) \
@ -259,7 +267,8 @@ $(RSC_MULTI5) : \
-fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB5NAME)$i.res} \
$(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB5IMAGES)) -lip={$j}/$i \
-lip={$j} ) \
-lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \
-lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res \
-lip=$(SOLARSRC)/$(RSCDEFIMG)/$i -lip=$(SOLARSRC)/$(RSCDEFIMG) ) \
-subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \
-subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \
-oil={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \
@ -274,7 +283,8 @@ $(RSC_MULTI5) : \
-fs={$(BIN)/$(RESLIB5NAME)$i.res} \
$(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB5IMAGES)) -lip={$j}/$i \
-lip={$j} ) \
-lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \
-lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res \
-lip=$(SOLARSRC)/$(RSCDEFIMG)/$i -lip=$(SOLARSRC)/$(RSCDEFIMG) ) \
-subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \
-subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \
-oil=$(BIN) \
@ -320,7 +330,8 @@ $(RSC_MULTI6) : \
-fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB6NAME)$i.res} \
$(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB6IMAGES)) -lip={$j}/$i \
-lip={$j} ) \
-lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \
-lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res \
-lip=$(SOLARSRC)/$(RSCDEFIMG)/$i -lip=$(SOLARSRC)/$(RSCDEFIMG) ) \
-subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \
-subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \
-oil={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \
@ -335,7 +346,8 @@ $(RSC_MULTI6) : \
-fs={$(BIN)/$(RESLIB6NAME)$i.res} \
$(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB6IMAGES)) -lip={$j}/$i \
-lip={$j} ) \
-lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \
-lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res \
-lip=$(SOLARSRC)/$(RSCDEFIMG)/$i -lip=$(SOLARSRC)/$(RSCDEFIMG) ) \
-subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \
-subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \
-oil=$(BIN) \
@ -381,7 +393,8 @@ $(RSC_MULTI7) : \
-fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB7NAME)$i.res} \
$(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB7IMAGES)) -lip={$j}/$i \
-lip={$j} ) \
-lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \
-lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res \
-lip=$(SOLARSRC)/$(RSCDEFIMG)/$i -lip=$(SOLARSRC)/$(RSCDEFIMG) ) \
-subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \
-subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \
-oil={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \
@ -396,7 +409,8 @@ $(RSC_MULTI7) : \
-fs={$(BIN)/$(RESLIB7NAME)$i.res} \
$(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB7IMAGES)) -lip={$j}/$i \
-lip={$j} ) \
-lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \
-lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res \
-lip=$(SOLARSRC)/$(RSCDEFIMG)/$i -lip=$(SOLARSRC)/$(RSCDEFIMG) ) \
-subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \
-subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \
-oil=$(BIN) \
@ -442,7 +456,8 @@ $(RSC_MULTI8) : \
-fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB8NAME)$i.res} \
$(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB8IMAGES)) -lip={$j}/$i \
-lip={$j} ) \
-lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \
-lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res \
-lip=$(SOLARSRC)/$(RSCDEFIMG)/$i -lip=$(SOLARSRC)/$(RSCDEFIMG) ) \
-subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \
-subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \
-oil={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \
@ -457,7 +472,8 @@ $(RSC_MULTI8) : \
-fs={$(BIN)/$(RESLIB8NAME)$i.res} \
$(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB8IMAGES)) -lip={$j}/$i \
-lip={$j} ) \
-lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \
-lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res \
-lip=$(SOLARSRC)/$(RSCDEFIMG)/$i -lip=$(SOLARSRC)/$(RSCDEFIMG) ) \
-subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \
-subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \
-oil=$(BIN) \
@ -503,7 +519,8 @@ $(RSC_MULTI9) : \
-fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB9NAME)$i.res} \
$(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB9IMAGES)) -lip={$j}/$i \
-lip={$j} ) \
-lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \
-lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res \
-lip=$(SOLARSRC)/$(RSCDEFIMG)/$i -lip=$(SOLARSRC)/$(RSCDEFIMG) ) \
-subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \
-subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \
-oil={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \
@ -518,7 +535,8 @@ $(RSC_MULTI9) : \
-fs={$(BIN)/$(RESLIB9NAME)$i.res} \
$(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB9IMAGES)) -lip={$j}/$i \
-lip={$j} ) \
-lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \
-lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res \
-lip=$(SOLARSRC)/$(RSCDEFIMG)/$i -lip=$(SOLARSRC)/$(RSCDEFIMG) ) \
-subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \
-subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \
-oil=$(BIN) \
@ -564,7 +582,8 @@ $(RSC_MULTI10) : \
-fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB10NAME)$i.res} \
$(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB10IMAGES)) -lip={$j}/$i \
-lip={$j} ) \
-lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \
-lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res \
-lip=$(SOLARSRC)/$(RSCDEFIMG)/$i -lip=$(SOLARSRC)/$(RSCDEFIMG) ) \
-subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \
-subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \
-oil={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \
@ -579,7 +598,8 @@ $(RSC_MULTI10) : \
-fs={$(BIN)/$(RESLIB10NAME)$i.res} \
$(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB10IMAGES)) -lip={$j}/$i \
-lip={$j} ) \
-lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \
-lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res \
-lip=$(SOLARSRC)/$(RSCDEFIMG)/$i -lip=$(SOLARSRC)/$(RSCDEFIMG) ) \
-subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \
-subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \
-oil=$(BIN) \

50
solenv/inc/_tg_shl.mk
View file

@ -333,7 +333,7 @@ $(SHL1TARGETN) : \
$(SHL1STDLIBS) \
$(SHL1STDSHL) $(STDSHL1) \
$(SHL1LINKRES) \
) $(LINKOUTPUTFILTER)
)
# double check if target was really written... still making sense?
@@$(LS) $@
@echo linking $@.manifest ...
@ -357,7 +357,7 @@ $(SHL1TARGETN) : \
$(SHL1STDLIBS) \
$(SHL1STDSHL) $(STDSHL1) \
$(SHL1LINKRES) \
) $(LINKOUTPUTFILTER)
)
# double check if target was really written... still making sense?
@@$(LS) $@
@echo linking $@.manifest ...
@ -529,7 +529,6 @@ $(SHL1TARGETN) : \
$(SHL1STDLIBS:^"-l") \
$(SHL1LINKRES) \
$(SHL1STDSHL:^"-l") $(STDSHL1:^"-l") \
$(LINKOUTPUTFILTER)
@$(LS) $@ >& $(NULLDEV)
.ENDIF # "$(USE_DEFFILE)"!=""
@ -877,7 +876,7 @@ $(SHL2TARGETN) : \
$(SHL2STDLIBS) \
$(SHL2STDSHL) $(STDSHL2) \
$(SHL2LINKRES) \
) $(LINKOUTPUTFILTER)
)
# double check if target was really written... still making sense?
@@$(LS) $@
@echo linking $@.manifest ...
@ -901,7 +900,7 @@ $(SHL2TARGETN) : \
$(SHL2STDLIBS) \
$(SHL2STDSHL) $(STDSHL2) \
$(SHL2LINKRES) \
) $(LINKOUTPUTFILTER)
)
# double check if target was really written... still making sense?
@@$(LS) $@
@echo linking $@.manifest ...
@ -1073,7 +1072,6 @@ $(SHL2TARGETN) : \
$(SHL2STDLIBS:^"-l") \
$(SHL2LINKRES) \
$(SHL2STDSHL:^"-l") $(STDSHL2:^"-l") \
$(LINKOUTPUTFILTER)
@$(LS) $@ >& $(NULLDEV)
.ENDIF # "$(USE_DEFFILE)"!=""
@ -1421,7 +1419,7 @@ $(SHL3TARGETN) : \
$(SHL3STDLIBS) \
$(SHL3STDSHL) $(STDSHL3) \
$(SHL3LINKRES) \
) $(LINKOUTPUTFILTER)
)
# double check if target was really written... still making sense?
@@$(LS) $@
@echo linking $@.manifest ...
@ -1445,7 +1443,7 @@ $(SHL3TARGETN) : \
$(SHL3STDLIBS) \
$(SHL3STDSHL) $(STDSHL3) \
$(SHL3LINKRES) \
) $(LINKOUTPUTFILTER)
)
# double check if target was really written... still making sense?
@@$(LS) $@
@echo linking $@.manifest ...
@ -1617,7 +1615,6 @@ $(SHL3TARGETN) : \
$(SHL3STDLIBS:^"-l") \
$(SHL3LINKRES) \
$(SHL3STDSHL:^"-l") $(STDSHL3:^"-l") \
$(LINKOUTPUTFILTER)
@$(LS) $@ >& $(NULLDEV)
.ENDIF # "$(USE_DEFFILE)"!=""
@ -1965,7 +1962,7 @@ $(SHL4TARGETN) : \
$(SHL4STDLIBS) \
$(SHL4STDSHL) $(STDSHL4) \
$(SHL4LINKRES) \
) $(LINKOUTPUTFILTER)
)
# double check if target was really written... still making sense?
@@$(LS) $@
@echo linking $@.manifest ...
@ -1989,7 +1986,7 @@ $(SHL4TARGETN) : \
$(SHL4STDLIBS) \
$(SHL4STDSHL) $(STDSHL4) \
$(SHL4LINKRES) \
) $(LINKOUTPUTFILTER)
)
# double check if target was really written... still making sense?
@@$(LS) $@
@echo linking $@.manifest ...
@ -2161,7 +2158,6 @@ $(SHL4TARGETN) : \
$(SHL4STDLIBS:^"-l") \
$(SHL4LINKRES) \
$(SHL4STDSHL:^"-l") $(STDSHL4:^"-l") \
$(LINKOUTPUTFILTER)
@$(LS) $@ >& $(NULLDEV)
.ENDIF # "$(USE_DEFFILE)"!=""
@ -2509,7 +2505,7 @@ $(SHL5TARGETN) : \
$(SHL5STDLIBS) \
$(SHL5STDSHL) $(STDSHL5) \
$(SHL5LINKRES) \
) $(LINKOUTPUTFILTER)
)
# double check if target was really written... still making sense?
@@$(LS) $@
@echo linking $@.manifest ...
@ -2533,7 +2529,7 @@ $(SHL5TARGETN) : \
$(SHL5STDLIBS) \
$(SHL5STDSHL) $(STDSHL5) \
$(SHL5LINKRES) \
) $(LINKOUTPUTFILTER)
)
# double check if target was really written... still making sense?
@@$(LS) $@
@echo linking $@.manifest ...
@ -2705,7 +2701,6 @@ $(SHL5TARGETN) : \
$(SHL5STDLIBS:^"-l") \
$(SHL5LINKRES) \
$(SHL5STDSHL:^"-l") $(STDSHL5:^"-l") \
$(LINKOUTPUTFILTER)
@$(LS) $@ >& $(NULLDEV)
.ENDIF # "$(USE_DEFFILE)"!=""
@ -3053,7 +3048,7 @@ $(SHL6TARGETN) : \
$(SHL6STDLIBS) \
$(SHL6STDSHL) $(STDSHL6) \
$(SHL6LINKRES) \
) $(LINKOUTPUTFILTER)
)
# double check if target was really written... still making sense?
@@$(LS) $@
@echo linking $@.manifest ...
@ -3077,7 +3072,7 @@ $(SHL6TARGETN) : \
$(SHL6STDLIBS) \
$(SHL6STDSHL) $(STDSHL6) \
$(SHL6LINKRES) \
) $(LINKOUTPUTFILTER)
)
# double check if target was really written... still making sense?
@@$(LS) $@
@echo linking $@.manifest ...
@ -3249,7 +3244,6 @@ $(SHL6TARGETN) : \
$(SHL6STDLIBS:^"-l") \
$(SHL6LINKRES) \
$(SHL6STDSHL:^"-l") $(STDSHL6:^"-l") \
$(LINKOUTPUTFILTER)
@$(LS) $@ >& $(NULLDEV)
.ENDIF # "$(USE_DEFFILE)"!=""
@ -3597,7 +3591,7 @@ $(SHL7TARGETN) : \
$(SHL7STDLIBS) \
$(SHL7STDSHL) $(STDSHL7) \
$(SHL7LINKRES) \
) $(LINKOUTPUTFILTER)
)
# double check if target was really written... still making sense?
@@$(LS) $@
@echo linking $@.manifest ...
@ -3621,7 +3615,7 @@ $(SHL7TARGETN) : \
$(SHL7STDLIBS) \
$(SHL7STDSHL) $(STDSHL7) \
$(SHL7LINKRES) \
) $(LINKOUTPUTFILTER)
)
# double check if target was really written... still making sense?
@@$(LS) $@
@echo linking $@.manifest ...
@ -3793,7 +3787,6 @@ $(SHL7TARGETN) : \
$(SHL7STDLIBS:^"-l") \
$(SHL7LINKRES) \
$(SHL7STDSHL:^"-l") $(STDSHL7:^"-l") \
$(LINKOUTPUTFILTER)
@$(LS) $@ >& $(NULLDEV)
.ENDIF # "$(USE_DEFFILE)"!=""
@ -4141,7 +4134,7 @@ $(SHL8TARGETN) : \
$(SHL8STDLIBS) \
$(SHL8STDSHL) $(STDSHL8) \
$(SHL8LINKRES) \
) $(LINKOUTPUTFILTER)
)
# double check if target was really written... still making sense?
@@$(LS) $@
@echo linking $@.manifest ...
@ -4165,7 +4158,7 @@ $(SHL8TARGETN) : \
$(SHL8STDLIBS) \
$(SHL8STDSHL) $(STDSHL8) \
$(SHL8LINKRES) \
) $(LINKOUTPUTFILTER)
)
# double check if target was really written... still making sense?
@@$(LS) $@
@echo linking $@.manifest ...
@ -4337,7 +4330,6 @@ $(SHL8TARGETN) : \
$(SHL8STDLIBS:^"-l") \
$(SHL8LINKRES) \
$(SHL8STDSHL:^"-l") $(STDSHL8:^"-l") \
$(LINKOUTPUTFILTER)
@$(LS) $@ >& $(NULLDEV)
.ENDIF # "$(USE_DEFFILE)"!=""
@ -4685,7 +4677,7 @@ $(SHL9TARGETN) : \
$(SHL9STDLIBS) \
$(SHL9STDSHL) $(STDSHL9) \
$(SHL9LINKRES) \
) $(LINKOUTPUTFILTER)
)
# double check if target was really written... still making sense?
@@$(LS) $@
@echo linking $@.manifest ...
@ -4709,7 +4701,7 @@ $(SHL9TARGETN) : \
$(SHL9STDLIBS) \
$(SHL9STDSHL) $(STDSHL9) \
$(SHL9LINKRES) \
) $(LINKOUTPUTFILTER)
)
# double check if target was really written... still making sense?
@@$(LS) $@
@echo linking $@.manifest ...
@ -4881,7 +4873,6 @@ $(SHL9TARGETN) : \
$(SHL9STDLIBS:^"-l") \
$(SHL9LINKRES) \
$(SHL9STDSHL:^"-l") $(STDSHL9:^"-l") \
$(LINKOUTPUTFILTER)
@$(LS) $@ >& $(NULLDEV)
.ENDIF # "$(USE_DEFFILE)"!=""
@ -5229,7 +5220,7 @@ $(SHL10TARGETN) : \
$(SHL10STDLIBS) \
$(SHL10STDSHL) $(STDSHL10) \
$(SHL10LINKRES) \
) $(LINKOUTPUTFILTER)
)
# double check if target was really written... still making sense?
@@$(LS) $@
@echo linking $@.manifest ...
@ -5253,7 +5244,7 @@ $(SHL10TARGETN) : \
$(SHL10STDLIBS) \
$(SHL10STDSHL) $(STDSHL10) \
$(SHL10LINKRES) \
) $(LINKOUTPUTFILTER)
)
# double check if target was really written... still making sense?
@@$(LS) $@
@echo linking $@.manifest ...
@ -5425,7 +5416,6 @@ $(SHL10TARGETN) : \
$(SHL10STDLIBS:^"-l") \
$(SHL10LINKRES) \
$(SHL10STDSHL:^"-l") $(STDSHL10:^"-l") \
$(LINKOUTPUTFILTER)
@$(LS) $@ >& $(NULLDEV)
.ENDIF # "$(USE_DEFFILE)"!=""

21
solenv/inc/installationtest.mk
View file

@ -105,10 +105,25 @@ cpptest : $(MISC)/$(TARGET)/installation.flag
.END
.IF "$(SOLAR_JAVA)" == "TRUE" && "$(OOO_JUNIT_JAR)" != ""
javatest .PHONY : $(JAVATARGET)
javatest_% .PHONY : $(JAVATARGET)
$(COMMAND_ECHO)$(RM) -r $(MISC)/$(TARGET)/user
$(COMMAND_ECHO)$(MKDIRHIER) $(MISC)/$(TARGET)/user
$(COMMAND_ECHO)$(JAVAI) $(JAVAIFLAGS) $(JAVACPS) \
'$(OOO_JUNIT_JAR)$(PATH_SEPERATOR)$(CLASSPATH)' \
-Dorg.openoffice.test.arg.soffice=$(my_soffice) \
-Dorg.openoffice.test.arg.user=$(my_file)$(PWD)/$(MISC)/$(TARGET)/user \
$(my_javaenv) $(TEST_ARGUMENTS:^"-Dorg.openoffice.test.arg.testarg.") \
org.junit.runner.JUnitCore \
$(subst,/,. $(PACKAGE)).$(@:s/javatest_//)
$(RM) -r $(MISC)/$(TARGET)/user
$(MKDIRHIER) $(MISC)/$(TARGET)/user
$(JAVAI) $(JAVAIFLAGS) $(JAVACPS) \
.IF "$(OS)" == "WNT" && "$(OOO_TEST_SOFFICE)" == ""
$(RM) -r $(installationtest_instpath) $(MISC)/$(TARGET)/installation.flag
javatest : $(MISC)/$(TARGET)/installation.flag
.END
javatest .PHONY : $(JAVATARGET)
$(COMMAND_ECHO)$(RM) -r $(MISC)/$(TARGET)/user
$(COMMAND_ECHO)$(MKDIRHIER) $(MISC)/$(TARGET)/user
$(COMMAND_ECHO)$(JAVAI) $(JAVAIFLAGS) $(JAVACPS) \
'$(OOO_JUNIT_JAR)$(PATH_SEPERATOR)$(CLASSPATH)' \
-Dorg.openoffice.test.arg.soffice=$(my_soffice) \
-Dorg.openoffice.test.arg.user=$(my_file)$(PWD)/$(MISC)/$(TARGET)/user \

6
solenv/inc/minor.mk
View file

@ -1,5 +1,5 @@
RSCVERSION=300
RSCREVISION=300m98(Build:9568)
BUILD=9568
LAST_MINOR=m98
RSCREVISION=300m99(Build:9570)
BUILD=9570
LAST_MINOR=m99
SOURCEVERSION=DEV300

14
solenv/inc/tg_jar.mk
View file

@ -57,7 +57,7 @@ $(JARMANIFEST) .PHONY : $(CUSTOMMANIFESTFILEDEP)
@@-$(RM) $@
$(COMMAND_ECHO)echo Manifest-Version: 1.0 > $@
.IF "$(JARCLASSPATH)" != ""
echo $(USQ)Class-Path: $(JARCLASSPATH)$(USQ) >> $@
$(COMMAND_ECHO)echo $(USQ)Class-Path: $(JARCLASSPATH)$(USQ) >> $@
.ENDIF
# $(RSCREVISION) contains chars that must be quoted (for *NIX shells)
$(COMMAND_ECHO)echo $(USQ)Solar-Version: $(RSCREVISION)$(USQ) >> $@
@ -67,6 +67,14 @@ $(JARMANIFEST) .PHONY : $(CUSTOMMANIFESTFILEDEP)
.ENDIF # "$(JARMANIFEST)"!=""
.ENDIF # "$(NEW_JAR_PACK)"!=""
.IF "$(JARCLASSEXCLUDES)" == ""
ZIPJAR_EXCLUDE=
.ELSE # "$(JARCLASSEXCLUDES)" == ""
ZIPJAR_EXCLUDE=$(foreach,i,$(JARCLASSEXCLUDES) -x "$i")
# format:
# JARCLASSEXCLUDES=foo/* bar/*
.ENDIF # "$(JARCLASSEXCLUDES)" == ""
#
# build jar
#
@ -82,8 +90,8 @@ $(JARTARGETN) :
@-find . -type d -user $(USER) ! -perm -5 -print | xargs test "$$1" != "" && chmod +r $$1
.ENDIF
.IF "$(JARMANIFEST)"!=""
$(COMMAND_ECHO)cd $(CLASSDIR)/$(TARGET) && zip $(ZIP_VERBOSITY) -u -rX ../$(@:f) $(subst,$(CLASSDIR)/$(TARGET)/, $(JARMANIFEST)) $(CHECKZIPRESULT)
$(COMMAND_ECHO)cd $(CLASSDIR)/$(TARGET) && zip $(ZIP_VERBOSITY) -u -rX ../$(@:f) $(subst,$(CLASSDIR)/$(TARGET)/, $(JARMANIFEST)) $(ZIPJAR_EXCLUDE) $(CHECKZIPRESULT)
.ENDIF # "$(JARMANIFEST)"!=""
$(COMMAND_ECHO)cd $(CLASSDIR) && zip $(ZIP_VERBOSITY) -u -rX $(@:f) $(subst,\,/ $(JARCLASSDIRS)) $(CHECKZIPRESULT)
$(COMMAND_ECHO)cd $(CLASSDIR) && zip $(ZIP_VERBOSITY) -u -rX $(@:f) $(subst,\,/ $(JARCLASSDIRS)) $(ZIPJAR_EXCLUDE) $(CHECKZIPRESULT)
.ENDIF

11
solenv/inc/tg_java.mk
View file

@ -42,13 +42,11 @@ $(MISC)/java/com/sun/star/upd/$(VERSIONINFOFILE)_updversion.java .PHONY:
.IF "$(JAVATARGET)"!=""
.IF "$(PACKAGE)"!=""
$(CLASSDIR)/$(IDLPACKAGE)/%.class .NOINFER .IGNORE : %.java
# echo $@
@@-$(RM) $(JAVATARGET)
$(CLASSDIR)/$(PACKAGE)/%.class .NOINFER .IGNORE : %.java
$(COMMAND_ECHO)-$(RM) $(JAVATARGET)
.ELSE # "$(PACKAGE)"!=""
$(CLASSDIR)/%.class .NOINFER .IGNORE : %.java
# echo $@
@@-$(RM) $(JAVATARGET)
$(COMMAND_ECHO)-$(RM) $(JAVATARGET)
.ENDIF # "$(PACKAGE)"!=""
$(JAVATARGET) : $(JAVAFILES) $(JAVACLASSFILES)
@ -78,7 +76,6 @@ $(JAVATARGET) : $(JAVAFILES) $(JAVACLASSFILES)
@@-find $(CLASSDIR) -type d -user $(USER) \! -perm -5 -print | xargs chmod a+r $$1
.ENDIF
.ENDIF
@echo > $@
@$(TOUCH) $@
.ENDIF # "$(JAVATARGET)"!=""

6
solenv/inc/tg_rslb.mk
View file

@ -43,7 +43,8 @@ $(RSC_MULTI$(TNR)) : \
-fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB$(TNR)NAME)$i.res} \
$(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB$(TNR)IMAGES)) -lip={$j}/$i \
-lip={$j} ) \
-lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \
-lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res \
-lip=$(SOLARSRC)/$(RSCDEFIMG)/$i -lip=$(SOLARSRC)/$(RSCDEFIMG) ) \
-subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \
-subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \
-oil={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \
@ -58,7 +59,8 @@ $(RSC_MULTI$(TNR)) : \
-fs={$(BIN)/$(RESLIB$(TNR)NAME)$i.res} \
$(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB$(TNR)IMAGES)) -lip={$j}/$i \
-lip={$j} ) \
-lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \
-lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res \
-lip=$(SOLARSRC)/$(RSCDEFIMG)/$i -lip=$(SOLARSRC)/$(RSCDEFIMG) ) \
-subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \
-subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \
-oil=$(BIN) \

5
solenv/inc/tg_shl.mk
View file

@ -362,7 +362,7 @@ $(SHL$(TNR)TARGETN) : \
$(SHL$(TNR)STDLIBS) \
$(SHL$(TNR)STDSHL) $(STDSHL$(TNR)) \
$(SHL$(TNR)LINKRES) \
) $(LINKOUTPUTFILTER)
)
# double check if target was really written... still making sense?
@@$(LS) $@
@echo linking $@.manifest ...
@ -386,7 +386,7 @@ $(SHL$(TNR)TARGETN) : \
$(SHL$(TNR)STDLIBS) \
$(SHL$(TNR)STDSHL) $(STDSHL$(TNR)) \
$(SHL$(TNR)LINKRES) \
) $(LINKOUTPUTFILTER)
)
# double check if target was really written... still making sense?
@@$(LS) $@
@echo linking $@.manifest ...
@ -558,7 +558,6 @@ $(SHL$(TNR)TARGETN) : \
$(SHL$(TNR)STDLIBS:^"-l") \
$(SHL$(TNR)LINKRES) \
$(SHL$(TNR)STDSHL:^"-l") $(STDSHL$(TNR):^"-l") \
$(LINKOUTPUTFILTER)
@$(LS) $@ >& $(NULLDEV)
.ENDIF # "$(USE_DEFFILE)"!=""

3
solenv/inc/wntmsci11.mk
View file

@ -230,10 +230,9 @@ _VC_MANIFEST_BASENAME=__VC80
_VC_MANIFEST_BASENAME=__VC90
.ENDIF
LINK=link /MACHINE:IX86
LINK=link /MACHINE:IX86 /IGNORE:4102 /IGNORE:4197
# do *not* add $(NOLOGO) to LINK or LINKFLAGS. Strangely, the wntmsci12 linker links fine then, but exits with
# a return value 1, which makes dmake think it failed
LINKOUTPUTFILTER= $(PIPEERROR) $(GREP) -v "LNK4197:"
.IF "$(PRODUCT)"!="full"
.ELSE
LINKFLAGS=/MAP /OPT:NOREF