e34ac42e6e
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
215 lines
5.9 KiB
Makefile
215 lines
5.9 KiB
Makefile
#*************************************************************************
|
|
#
|
|
# 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.mk,v $
|
|
#
|
|
# $Revision: 1.17 $
|
|
#
|
|
# 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
|
|
# <http://www.openoffice.org/license.html>
|
|
# for a copy of the LGPLv3 License.
|
|
#
|
|
#*************************************************************************
|
|
|
|
PRJ=..
|
|
|
|
PRJNAME=moz
|
|
TARGET=moz_unzip
|
|
|
|
# --- Settings -----------------------------------------------------
|
|
|
|
.INCLUDE : settings.mk
|
|
|
|
# --- Files --------------------------------------------------------
|
|
|
|
.IF "$(PREBUILD_MOZAB)" == "" || "$(SYSTEM_MOZILLA)" == "YES" || "$(WITH_MOZILLA)" == "NO"
|
|
|
|
dummy:
|
|
@echo "No need to unpack the prebuild mozab packages"
|
|
|
|
.ELSE # unpack mozab zips
|
|
.INCLUDE : target.mk
|
|
|
|
.IF "$(BUILD_MOZAB)"=="TRUE"
|
|
ALLTAR:
|
|
@echo "Does not need build mozab zipped!"
|
|
.ELSE
|
|
ALLTAR: \
|
|
$(MISC)$/unpacked_$(TARGET)_inc \
|
|
$(MISC)$/unpacked_$(TARGET)_lib \
|
|
$(BIN)$/mozruntime.zip \
|
|
$(MISC)$/replace_old_nss_libs
|
|
.ENDIF
|
|
.IF "$(GUI)" == "UNX"
|
|
|
|
$(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_%_inc : $(OS)$(COM)$(CPU)inc.zip
|
|
unzip -o -d $(INCCOM) $(OS)$(COM)$(CPU)inc.zip && $(TOUCH) $@
|
|
chmod -R 775 $(INCCOM)
|
|
|
|
.ELSE
|
|
|
|
$(MISC)$/unpacked_$(TARGET)_lib : $(OS)$(COM)$(CPU)lib.zip
|
|
unzip -o -d $(LB) $(OS)$(COM)$(CPU)lib.zip && \
|
|
$(TOUCH) $@
|
|
|
|
$(MISC)$/unpacked_$(TARGET)_inc : $(OS)$(COM)$(CPU)inc.zip
|
|
unzip -o -d $(INCCOM) $(OS)$(COM)$(CPU)inc.zip && $(TOUCH) $@
|
|
|
|
.ENDIF
|
|
|
|
$(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
|
|
# then we must take care not to deliver the old NSS stuff from the "prebuilts"
|
|
.IF "$(GUI)" == "WNT"
|
|
FREEBL_LIB_OLD=freebl3
|
|
.ELSE # "$(GUI)" == "WNT"
|
|
.IF "$(OS)$(CPUNAME)" == "SOLARISSPARC"
|
|
FREEBL_LIB_OLD=freebl_32fpu_3
|
|
.ELSE # "$(OS)$(CPUNAME)" == "SOLARISSPARC"
|
|
FREEBL_LIB_OLD=freebl3
|
|
.ENDIF # "$(OS)$(CPUNAME)" == "SOLARISSPARC"
|
|
.ENDIF # "$(GUI)" == "WNT"
|
|
|
|
BIN_RUNTIMELIST= \
|
|
$(FREEBL_LIB_OLD) \
|
|
nspr4 \
|
|
plc4 \
|
|
plds4 \
|
|
nss3 \
|
|
ssl3 \
|
|
softokn3 \
|
|
smime3
|
|
|
|
.IF "$(GUI)"=="WNT"
|
|
.IF "$(COM)"=="GCC"
|
|
LIBLIST= \
|
|
libnspr4.a \
|
|
libnss3.a \
|
|
libsmime3.a \
|
|
libplc4.a \
|
|
libplds4.a \
|
|
libssl3.a
|
|
|
|
.ELSE
|
|
LIBLIST= \
|
|
nspr4.lib \
|
|
plc4.lib \
|
|
plds4.lib \
|
|
nss3.lib \
|
|
ssl3.lib\
|
|
smime3.lib
|
|
.ENDIF
|
|
.ELSE #"$(GUI)"=="WNT"
|
|
LIBLIST= \
|
|
lib$(FREEBL_LIB_OLD)$(DLLPOST) \
|
|
libnspr4$(DLLPOST) \
|
|
libsoftokn3$(DLLPOST) \
|
|
libplc4$(DLLPOST) \
|
|
libplds4$(DLLPOST) \
|
|
libnss3$(DLLPOST) \
|
|
libssl3$(DLLPOST) \
|
|
libsmime3$(DLLPOST)
|
|
|
|
.ENDIF # .IF "$(GUI)"=="WNT"
|
|
|
|
|
|
NSS_INCLUDE_LIST= nspr nss
|
|
|
|
|
|
.IF "$(OS)" == "SOLARIS"
|
|
.IF "$(CPU)" == "S" #32bit
|
|
FREEBL=freebl_32fpu_3 freebl_32int64_3 freebl_32int_3
|
|
.ELIF "$(CPU)" == "U" #64bit unxsolu4
|
|
FREEBL=freebl_64int_3 freebl_64fpu_3
|
|
.ELSE
|
|
FREEBL=freebl3
|
|
.ENDIF #"$(CPU)" == "S"
|
|
|
|
.ELSE # "$(OS)" == "SOLARIS"
|
|
FREEBL=freebl3
|
|
.ENDIF # "$(OS)" == "SOLARIS"
|
|
|
|
|
|
NSS_MODULE_RUNTIME_LIST:= \
|
|
$(FREEBL) \
|
|
nspr4 \
|
|
nss3 \
|
|
nssckbi \
|
|
nssdbm3 \
|
|
nssutil3 \
|
|
plc4 \
|
|
plds4 \
|
|
smime3 \
|
|
softokn3 \
|
|
sqlite3 \
|
|
ssl3
|
|
|
|
|
|
.ENDIF #.IF "$(ENABLE_NSS_MODULE)"=="YES"
|
|
# Remove the nss libs build in moz and those build in the nss module
|
|
$(MISC)$/replace_old_nss_libs : $(MISC)$/unpacked_$(TARGET)_lib \
|
|
$(MISC)$/unpacked_$(TARGET)_inc $(BIN)$/mozruntime.zip
|
|
+$(foreach,dir,$(NSS_INCLUDE_LIST) $(RENAME:s/+//) $(INCCOM)$/$(dir) \
|
|
$(INCCOM)$/$(dir)_remove_me &&) echo >& $(NULLDEV)
|
|
$(foreach,dir,$(NSS_INCLUDE_LIST) rm -r -f $(INCCOM)$/$(dir)_remove_me &&) \
|
|
echo >& $(NULLDEV)
|
|
$(foreach,lib,$(LIBLIST) rm -f $(LB)$/$(lib) &&) \
|
|
echo >& $(NULLDEV)
|
|
$(foreach,lib,$(BIN_RUNTIMELIST) zip -d $(BIN)$/mozruntime.zip $(DLLPRE)$(lib)$(DLLPOST) &&) \
|
|
echo >& $(NULLDEV)
|
|
.IF "$(GUI)"=="WNT"
|
|
$(foreach,lib,$(NSS_MODULE_RUNTIME_LIST) zip -g -j $(BIN)$/mozruntime.zip $(SOLARBINDIR)$/$(DLLPRE)$(lib)$(DLLPOST) &&) \
|
|
echo >& $(NULLDEV)
|
|
.ELSE
|
|
$(foreach,lib,$(NSS_MODULE_RUNTIME_LIST) zip -g -j $(BIN)$/mozruntime.zip $(SOLARLIBDIR)$/$(DLLPRE)$(lib)$(DLLPOST) &&) \
|
|
echo >& $(NULLDEV)
|
|
.ENDIF
|
|
$(TOUCH) $@
|
|
|
|
.ENDIF # unpack mozab zips
|
|
|