summaryrefslogtreecommitdiff
path: root/offapi/util
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2003-03-26 12:59:19 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2003-03-26 12:59:19 +0000
commit19a8c241f9f0c5fd164e56ab1763a9cffab5318e (patch)
treef37fab3c31817b53354a1c08a5f8e386a79a4c5b /offapi/util
parent44bf5dacd75eec3d27acf9590a29ce49a3b585cf (diff)
MWS_SRX644: migrate branch mws_srx644 -> HEAD
Diffstat (limited to 'offapi/util')
-rw-r--r--offapi/util/makefile.mk29
-rw-r--r--offapi/util/makefile.pmk26
-rw-r--r--offapi/util/target.pmk6
3 files changed, 34 insertions, 27 deletions
diff --git a/offapi/util/makefile.mk b/offapi/util/makefile.mk
index cc073a3a8c01..bbb5e2c7ca0c 100644
--- a/offapi/util/makefile.mk
+++ b/offapi/util/makefile.mk
@@ -2,9 +2,9 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.51 $
+# $Revision: 1.52 $
#
-# last change: $Author: dfoster $ $Date: 2003-01-27 14:34:21 $
+# last change: $Author: hr $ $Date: 2003-03-26 13:59:19 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@@ -130,23 +130,19 @@ UNOIDLDBFILES= \
$(UCR)$/cssimage.db\
$(UCR)$/cssuidialogs.db \
$(UCR)$/cssui.db \
- $(UCR)$/dcsssync.db \
$(UCR)$/dcssframe.db \
$(UCR)$/dcssaccessibility.db\
$(UCR)$/dcssawt.db\
$(UCR)$/dcssabridge.db\
+ $(UCR)$/dcsscbackend.db\
$(UCR)$/dcssi18n.db\
$(UCR)$/dcssauth.db\
- $(UCR)$/dcsscbackend.db\
$(UCR)$/dcssdrawing.db\
- $(UCR)$/dcssformula.db \
+ $(UCR)$/dcssformula.db \
$(UCR)$/dcsssheet.db\
$(UCR)$/dcsstable.db\
$(UCR)$/dcsstext.db \
- $(UCR)$/dcssscriptframework.db \
- $(UCR)$/dcsssfprovider.db \
- $(UCR)$/dcsssfsecurity.db \
- $(UCR)$/dcsssfstorage.db
+ $(UCR)$/dcsschart.db
REFERENCE_SO_60_RDB=$(SOLARROOT)$/odk_reference$/SO-6.0$/applicat.rdb
@@ -156,7 +152,6 @@ REGISTRYCHECKFLAG=$(MISC)$/registrycheck.flag
# --- Targets ------------------------------------------------------
-.IF "$(depend)" == ""
ALLTAR : $(UCR)$/types.db $(OUT)$/ucrdoc$/types_doc.db
$(UCR)$/types.db : $(UCR)$/offapi.db $(SOLARBINDIR)$/udkapi.rdb
@@ -168,26 +163,16 @@ $(OUT)$/ucrdoc$/types_doc.db : $(OUT)$/ucrdoc$/offapi_doc.db $(SOLARBINDIR)$/udk
+$(GNUCOPY) -f $(OUT)$/ucrdoc$/offapi_doc.db $@
+$(REGMERGE) $@ / $(SOLARBINDIR)$/udkapi_doc.rdb
-.ELSE
-ALL : ALLDEP
-.ENDIF
-
.INCLUDE : target.mk
.IF "$(BUILD_SOSL)"==""
-ALLTAR: $(REGISTRYCHECKFLAG) autodoc
+ALLTAR: $(REGISTRYCHECKFLAG)
# special work necessary for i18n reservedWords
# ATTENTION: no special handling for other types is allowed.
$(REGISTRYCHECKFLAG) : $(UCR)$/types.db $(OUT)$/ucrdoc$/types_doc.db
+$(REGCOMPARE) -t -r1 $(REFERENCE_SO_60_RDB) -r2 $(UCR)$/types.db -x /UCR/com/sun/star/i18n/reservedWords
- +$(REGCOMPARE) -t -r1 $(REFERENCE_SO_60_DOC_RDB) -r2 $(OUT)$/ucrdoc$/types_doc.db -x /UCR/com/sun/star/i18n/reservedWords && echo > $@
-
-autodoc: $(OUT)$/misc$/offapi.autodoc
-
-$(OUT)$/misc$/offapi.autodoc:
- $(shell sed "p" $(OUT)$/misc$/*.idls | tr "[:cntrl:] " "\n\n" | sed -f autodoc.sed >$@)
- echo "$@ done"
+ +$(REGCOMPARE) -t -r1 $(REFERENCE_SO_60_DOC_RDB) -r2 $(OUT)$/ucrdoc$/types_doc.db -x /UCR/com/sun/star/i18n/reservedWords && echo > $(REGISTRYCHECKFLAG)
.ENDIF
diff --git a/offapi/util/makefile.pmk b/offapi/util/makefile.pmk
index d9995f996051..466ab3e41e1d 100644
--- a/offapi/util/makefile.pmk
+++ b/offapi/util/makefile.pmk
@@ -2,9 +2,9 @@
#
# $RCSfile: makefile.pmk,v $
#
-# $Revision: 1.3 $
+# $Revision: 1.4 $
#
-# last change: $Author: obr $ $Date: 2002-06-24 13:36:16 $
+# last change: $Author: hr $ $Date: 2003-03-26 13:59:19 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@@ -60,8 +60,24 @@
#
#*************************************************************************
+#PROJECTPCH4DLL=TRUE
+#PROJECTPCH=sjpch
+#PROJECTPCHSOURCE=$(PRJ)$/util\sjpch
+#PDBTARGET=sj
+PRJPCH=
+ENABLE_EXCEPTIONS=TRUE
+
+JAVAPREPRO=
+.IF "$(JDK_VERSION)" == "110"
+JAVAPREPRO=-jdk11
+.ENDIF
+.IF "$(PRODUCT)" != ""
+JAVAPREPRO=$(JAVAPREPRO) + " -product"
+.ENDIF
+
# --- Settings -----------------------------------------------------
.INCLUDE : settings.mk
+.INCLUDE : sv.mk
NOUNODOC=
BUILD_URD_ONLY=TRUE
@@ -69,3 +85,9 @@ LOCALIDLFILES=TRUE
URDDOC=TRUE
+.IF "$(OS)"=="SOLARIS"
+.IF "$(CPU)"=="I"
+UNOIDL=unoidl
+.ENDIF
+.ENDIF
+
diff --git a/offapi/util/target.pmk b/offapi/util/target.pmk
index a7c4f9a81a39..d1f3c7de2774 100644
--- a/offapi/util/target.pmk
+++ b/offapi/util/target.pmk
@@ -2,9 +2,9 @@
#
# $RCSfile: target.pmk,v $
#
-# $Revision: 1.2 $
+# $Revision: 1.3 $
#
-# last change: $Author: mi $ $Date: 2002-11-08 15:08:43 $
+# last change: $Author: hr $ $Date: 2003-03-26 13:59:19 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@@ -61,7 +61,7 @@
#*************************************************************************
$(OUT)$/misc$/$(TARGET).idls: makefile.mk
- +$(RM) $@
+ +-$(RM) $@
+$(TYPE) $(mktmp $(foreach,i,$(IDLFILES) $(PACKAGE)$/$i)) >>$@
ALLTAR: $(OUT)$/misc$/$(TARGET).idls