diff options
author | Oliver Bolte <obo@openoffice.org> | 2009-09-08 08:54:47 +0000 |
---|---|---|
committer | Oliver Bolte <obo@openoffice.org> | 2009-09-08 08:54:47 +0000 |
commit | e34ac42e6e7fc1b03455358cb3eaed1ee9007539 (patch) | |
tree | b81b44020ca2effbf6db186b635ee53b802a862d | |
parent | 744928325ecee04b12b8f6ae82d7d6c892917279 (diff) |
CWS-TOOLING: integrate CWS dba32f
2009-08-31 10:43:51 +0200 msc r275590 : #no issuezilla available# make the testcase more error proof
2009-08-31 10:43:28 +0200 msc r275589 : #no issuezilla available# make the testcase more error proof
2009-08-31 10:40:33 +0200 msc r275588 : i85993 remove bugid
2009-08-31 10:38:28 +0200 msc r275587 : i100000
2009-08-27 13:27:32 +0200 fs r275476 : #i103882#
2009-08-27 12:47:54 +0200 fs r275474 : #i104544#
do not allow re-entrance for impl_ensureControl_nothrow
Actually, this is part of the fix only. I also removed the code which triggered this re-entrance (from
the grid control implementation), but to ensure it won't happen, again, I added some safety herein.
2009-08-27 12:47:16 +0200 fs r275473 : #i104544# SetState: Do not call Update at the window which we just set text for. It should (sic\!) not be needed, but causes trouble
2009-08-27 10:18:05 +0200 mav r275461 : #i103266# do not allow any stream operation on package streams while commiting the package
2009-08-20 15:25:48 +0200 fs r275184 : #i104362# fall back to a ViewObjectContactOfSdrObj in case we don't have a page view
2009-08-20 15:25:06 +0200 fs r275183 : AUGMENT_LIBRARY_PATH
2009-08-20 15:10:34 +0200 fs r275182 : AUGMENT_LIBRARY_PATH
2009-08-20 09:50:36 +0200 oj r275167 : #i104266# notify propertyforward when new dest was created
2009-08-19 08:01:28 +0200 mav r275133 : #i103266# fix the typo
2009-08-18 22:45:34 +0200 fs r275131 : #i10000#
2009-08-18 13:53:07 +0200 oj r275105 : #i104266# set column settings after alter columns
2009-08-18 13:41:49 +0200 fs r275103 : #i102550# do not interpret names of existing data sources as system path
2009-08-18 13:13:05 +0200 oj r275097 : #i103882# use correct number Format
2009-08-18 12:59:13 +0200 fs r275094 : #i104181#
2009-08-18 09:07:48 +0200 fs r275079 : updated readme to refer to proper 1.1.14
2009-08-18 08:32:31 +0200 oj r275077 : #i104187# wrong default for FirstCellAsLabel corrected
2009-08-18 08:10:00 +0200 oj r275076 : #i104187# dispose status controller to avoid access of dead statusBar in sfx
2009-08-17 21:56:19 +0200 fs r275074 : merge fix for issue #102564# from dba32e
2009-08-17 15:34:40 +0200 fs r275058 : don't set MaxFieldSize to 0 unconditionally
2009-08-17 14:33:57 +0200 oj r275054 : #i103528# patch for bitxtor
2009-08-17 14:12:26 +0200 oj r275051 : #i104160# fix VerticalAlignment
2009-08-17 14:11:47 +0200 oj r275050 : #i104160# fix VerticalAlignment
2009-08-14 15:54:04 +0200 mav r274989 : #i103266# avoid possibility for race condition
2009-08-13 13:52:43 +0200 fs r274939 : improved diagnostics
2009-08-13 13:52:28 +0200 fs r274938 : typo
2009-08-13 12:51:03 +0200 fs r274934 : #i103763# provided by cloph: correct libIDL check when compiling Mozilla
2009-08-13 12:43:23 +0200 fs r274933 : #i103763# provided by cloph: allow to cross-compile prebuilt zips on Mac
2009-08-13 12:41:15 +0200 fs r274932 : #i103371# fire PREPARECLOSEDOC even for embedded objects (why not?)
2009-08-13 12:24:49 +0200 fs r274930 : #i99890# remove 'Insert Control' from the popup menu
2009-08-13 12:23:38 +0200 fs r274929 : #i99890# DoToolboxAction: assert unknown/unimplemented actions
2009-08-13 09:32:07 +0200 fs r274923 : #i103721#
2009-08-13 09:26:32 +0200 fs r274922 : #i99894# provided by dtardon: xforms_nowFunction: use proper memory allocation function
2009-08-13 09:20:21 +0200 fs r274921 : #i103938# provided by cmc: pass proper arguments to OUString::intern
2009-08-12 22:34:28 +0200 fs r274916 : #i104139# when executing a PopupMenu, pass the POPUPMENU_NOMOUSEUPCLOSE flag
-rw-r--r-- | moz/extractfiles.mk | 2 | ||||
-rw-r--r-- | moz/makefile.mk | 98 | ||||
-rw-r--r-- | moz/zipped/makefile.mk | 22 |
3 files changed, 115 insertions, 7 deletions
diff --git a/moz/extractfiles.mk b/moz/extractfiles.mk index 654cbc8d05e0..dfb14afa8a3e 100644 --- a/moz/extractfiles.mk +++ b/moz/extractfiles.mk @@ -30,7 +30,7 @@ #************************************************************************* MOZTARGET=$(OS)$(COM)$(CPU) -MOZ_DIST_DIR=$(MISC)$/build$/mozilla$/dist +MOZ_DIST_DIR=$(MISC)$/build$/mozilla$/$(BUILD_DIR)$/dist MOZ_BIN_DIR=$(MOZ_DIST_DIR)$/bin RUNTIME_DIR=$(MISC)$/$(MOZTARGET)runtime LIB_DIR=$(LB) diff --git a/moz/makefile.mk b/moz/makefile.mk index 75be11886f66..3722229bf74d 100644 --- a/moz/makefile.mk +++ b/moz/makefile.mk @@ -160,9 +160,13 @@ DEFAULT_MOZILLA_TOOLKIT*=gtk2 MOZILLA_CONFIGURE_FLAGS+= --enable-default-toolkit=$(DEFAULT_MOZILLA_TOOLKIT) .ENDIF -CONFIGURE_ACTION=sh -c "./configure $(MOZILLA_CONFIGURE_FLAGS)" +# create a objdir build = build files in a seperate directory, not in the sourcetree directly +CONFIGURE_DIR=$(CPU)_objdir +BUILD_DIR=$(CONFIGURE_DIR) +MOZ_CROSSCOMPILE=CROSS_COMPILE=1 CC="gcc -arch $(MOZ_ARCH)" CXX="g++ -arch $(MOZ_ARCH)" AR=ar + +CONFIGURE_ACTION=$(null,$(MOZ_ARCH) $(NULL) $(MOZ_CROSSCOMPILE)) ../configure $(MOZILLA_CONFIGURE_FLAGS) -BUILD_DIR= .IF "$(USE_SHELL)"!="4nt" BUILD_ACTION:=$(GNUMAKE) -j$(EXTMAXPROCESS) .ELSE @@ -332,4 +336,94 @@ $(MISC)$/build$/moztools.complete : $(MISC)$/build$/moztools.unpack zip: \ $(MISC)$/CREATETARBALL +.IF "$(GUIBASE)"=="aqua" +MOZ_ARCH=$(eq,$(CPU),I i386 ppc) +MOZILLA_CONFIGURE_FLAGS+=$(eq,$(CPU),I --target=i386-apple-darwin8 --target=powerpc-apple-darwin8) + +force_clean : + @$(IFEXIST) $(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE) $(THEN) echo 'ERROR: get rid of your outputdir first (or refactor the makefiles to allow incremental creation of prebuilt zips). Remember to copy already created zips to a safe place '; exit 1 $(FI) + +zip_intel .SEQUENTIAL: force_clean $(MISC)$/CREATETARBALL + +zip_ppc .SEQUENTIAL: force_clean $(MISC)$/CREATETARBALL + +# target-conditionals, when building target -> Macro is set +zip_intel ?= MOZ_ARCH=i386 +zip_intel ?= MOZILLA_CONFIGURE_FLAGS+=--target=i386-apple-darwin8 +zip_intel ?= CPU=I + +zip_ppc ?= MOZ_ARCH=ppc +zip_ppc ?= MOZILLA_CONFIGURE_FLAGS+=--target=powerpc-apple-darwin8 +zip_ppc ?= CPU=P + +zip_universal: $(OUT)$/zipped$/$(OS)$(COM)UBinc.zip $(OUT)$/zipped$/$(OS)$(COM)UBlib.zip $(OUT)$/zipped$/$(OS)$(COM)UBruntime.zip + @echo "All zips created successfully - copy from $(OUT)$/zipped to \$$SRC_ROOT/moz/zipped and use --disable-build-mozilla to use them" + +$(OUT)$/zipped$/$(OS)$(COM)UBinc.zip : zipped$/$(OS)$(COM)Pinc.zip zipped$/$(OS)$(COM)Iinc.zip + @echo "setting up for $@" + @rm -rf $(MISC)$/UB_inc + @$(MKDIRHIER) $(MISC)$/UB_inc$/intel + @$(MKDIR) $(MISC)$/UB_inc$/ppc + @$(MKDIR) $(MISC)$/UB_inc$/uni + @unzip -q zipped$/$(OS)$(COM)Pinc.zip -d $(MISC)$/UB_inc$/ppc + @unzip -q zipped$/$(OS)$(COM)Iinc.zip -d $(MISC)$/UB_inc$/intel +# use one of the two as basis for the universal one - (saves manually creating directories/copying identical files) + @unzip -q zipped$/$(OS)$(COM)Pinc.zip -d $(MISC)$/UB_inc$/uni +# add safety-warning to host-autogenerated headers (aren't used anywhere in OOo currently, but doesn't hurt to be safe +# bail out on everything that differs and is not a *.h file + @echo "flagging endian-specific headers with #error.." + @diff --brief -r $(MISC)$/UB_inc$/ppc $(MISC)$/UB_inc$/intel | awk \ + '/^Only in/ {{print; print "ERROR - file sets differ!"; exit 1}} \ + /^Files .*\.h differ$$/ {{target="$(MISC)$/UB_inc$/uni$/" substr($$2,length("$(MISC)$/UB_inc$/ppc")+2); \ + system("echo \"#error use native moz-zips, this header is endian-specific!\" | cat - " $$2 " > " target); next}} \ + {{print; print "ERROR - unexpected files encountered!"; exit 2}}' + @cd $(MISC)$/UB_inc$/uni ; zip -q -r ..$/$(@:f) * + @$(MKDIRHIER) $(@:d) + @$(MV) $(MISC)$/UB_inc$/$(@:f) $@ + @echo "successfully created $@" + +$(OUT)$/zipped$/$(OS)$(COM)UBlib.zip : zipped$/$(OS)$(COM)Plib.zip zipped$/$(OS)$(COM)Ilib.zip + @echo "setting up for $@" + @rm -rf $(MISC)$/UB_lib + @$(MKDIRHIER) $(MISC)$/UB_lib$/intel + @$(MKDIR) $(MISC)$/UB_lib$/ppc + @$(MKDIR) $(MISC)$/UB_lib$/uni + @unzip -q zipped$/$(OS)$(COM)Plib.zip -d $(MISC)$/UB_lib$/ppc + @unzip -q zipped$/$(OS)$(COM)Ilib.zip -d $(MISC)$/UB_lib$/intel +# use lipo on .a and .dylib files - bail out on anything else + @echo "creating universal binaries from libs..." + @diff --brief -s -r $(MISC)$/UB_lib$/ppc $(MISC)$/UB_lib$/intel | awk \ + '/^Only in/ {{print "ERROR - file sets differ!"; print; exit 1}} \ + /^Files .*\.(a|dylib) differ$$/ {{target="$(MISC)$/UB_lib$/uni$/" substr($$2,length("$(MISC)$/UB_lib$/ppc")+2); \ + if(0!=system("lipo -create -arch ppc "$$2" -arch i386 "$$4" -output " target)) exit 11; next}} \ + {{print; print "ERROR - unexpected files encountered!"; exit 2}}' + @cd $(MISC)$/UB_lib$/uni ; zip -q -r ..$/$(@:f) * + @$(MKDIRHIER) $(@:d) + @$(MV) $(MISC)$/UB_lib$/$(@:f) $@ + @echo "successfully created $@" + +$(OUT)$/zipped$/$(OS)$(COM)UBruntime.zip : zipped$/$(OS)$(COM)Pruntime.zip zipped$/$(OS)$(COM)Iruntime.zip + @echo "setting up for $@" + @rm -rf $(MISC)$/UB_runtime + @$(MKDIRHIER) $(MISC)$/UB_runtime$/intel + @$(MKDIR) $(MISC)$/UB_runtime$/ppc + @$(MKDIR) $(MISC)$/UB_runtime$/uni + @unzip -q zipped$/$(OS)$(COM)Pruntime.zip -d $(MISC)$/UB_runtime$/ppc + @unzip -q zipped$/$(OS)$(COM)Iruntime.zip -d $(MISC)$/UB_runtime$/intel +# use one of the two as basis for the universal one - (saves manually creating directories/copying identical files) + @unzip -q zipped$/$(OS)$(COM)Pruntime.zip -d $(MISC)$/UB_runtime$/uni +# @line -comments in autogenerated files: contains path of source-file, ignore different objdirs + @echo "creating universal binaries from libs..." + @diff --brief -I "^//@line [0-9][0-9]*" -r $(MISC)$/UB_runtime$/ppc $(MISC)$/UB_runtime$/intel | awk \ + '/^Only in/ {{print; print "ERROR - file sets differ!"; exit 1}} \ + /^Files .*\.dylib differ$$/ {{target="$(MISC)$/UB_runtime$/uni$/" substr($$2,length("$(MISC)$/UB_runtime$/ppc")+2); \ + if(0!=system("lipo -create -arch ppc "$$2" -arch i386 "$$4" -output " target)) exit 11; next}} \ + {{print; print "ERROR - unexpected files encountered!"; exit 2}}' + @cd $(MISC)$/UB_lib$/uni ; zip -q -r ..$/$(@:f) * + @$(MKDIRHIER) $(@:d) + @$(MV) $(MISC)$/UB_lib$/$(@:f) $@ + @echo "successfully created $@" + +.ENDIF # $(GUIBASE)=="aqua" + .INCLUDE : extractfiles.mk diff --git a/moz/zipped/makefile.mk b/moz/zipped/makefile.mk index 400b5767759c..66d0c38bc991 100644 --- a/moz/zipped/makefile.mk +++ b/moz/zipped/makefile.mk @@ -60,11 +60,11 @@ ALLTAR: \ .ENDIF .IF "$(GUI)" == "UNX" -$(MISC)$/unpacked_$(TARGET)_lib : $(OS)$(COM)$(CPU)lib.zip $(OS)$(COM)$(CPU)runtime.zip +$(MISC)$/unpacked_%_lib : $(OS)$(COM)$(CPU)lib.zip '$(OS)$(COM)$(CPU)runtime.zip' unzip -o -d $(LB) $(OS)$(COM)$(CPU)lib.zip && unzip -o -d $(LB) $(OS)$(COM)$(CPU)runtime.zip && $(TOUCH) $@ chmod -R 775 $(LB) -$(MISC)$/unpacked_$(TARGET)_inc : $(OS)$(COM)$(CPU)inc.zip +$(MISC)$/unpacked_%_inc : $(OS)$(COM)$(CPU)inc.zip unzip -o -d $(INCCOM) $(OS)$(COM)$(CPU)inc.zip && $(TOUCH) $@ chmod -R 775 $(INCCOM) @@ -79,14 +79,28 @@ $(MISC)$/unpacked_$(TARGET)_inc : $(OS)$(COM)$(CPU)inc.zip .ENDIF -$(BIN)$/mozruntime.zip : $(OS)$(COM)$(CPU)runtime.zip +$(BIN)$/mozruntime%zip : $(OS)$(COM)$(CPU)runtime.zip $(COPY) $(OS)$(COM)$(CPU)runtime.zip $(BIN)$/mozruntime.zip +# add alternative rules for universal binary moz-zips +.IF "$(GUIBASE)" == "aqua" +$(MISC)$/unpacked_%_lib : $(OS)$(COM)UBlib.zip '$(OS)$(COM)UBruntime.zip' + unzip -o -d $(LB) $(OS)$(COM)UBlib.zip && unzip -o -d $(LB) $(OS)$(COM)UBruntime.zip && $(TOUCH) $@ + chmod -R 775 $(LB) + +$(MISC)$/unpacked_%_inc : $(OS)$(COM)UBinc.zip + unzip -o -d $(INCCOM) $(OS)$(COM)UBinc.zip && $(TOUCH) $@ + chmod -R 775 $(INCCOM) + +$(BIN)$/mozruntime%zip : $(OS)$(COM)UBruntime.zip + $(COPY) $(OS)$(COM)UBruntime.zip $(BIN)$/mozruntime.zip + +.ENDIF # "$(GUIBASE)"=="aqua" + LIBLIST = BIN_RUNTIMELIST = NSS_INCLUDE_LIST = NSS_MODULE_RUNTIME_LIST = - .IF "$(ENABLE_NSS_MODULE)"=="YES" # The prebuilt moz files include all the old NSS stuff from moz and not the new # NSS libs, headers, etc, from the separate nss module. If we use the nss module |