diff options
author | Vladimir Glazounov <vg@openoffice.org> | 2009-03-13 17:03:00 +0000 |
---|---|---|
committer | Vladimir Glazounov <vg@openoffice.org> | 2009-03-13 17:03:00 +0000 |
commit | 99bb633e382e83f47f3e30a7c93705118880da06 (patch) | |
tree | 0a954f3dcad18424c471bcad019f16d3018803d1 /smoketestoo_native/com | |
parent | 5b55140742bac58f9f87031363c6e07f5f00749e (diff) |
CWS-TOOLING: integrate CWS smoketest21
2009-02-23 19:49:51 +0100 kz r268371 : #i96553# don't use cp -u anymore
2009-02-23 19:46:19 +0100 kz r268368 : #i96552# use of TMPDIR for all unix
2009-02-19 17:52:04 +0100 kz r268302 : #i96552# set installpath to /tmp if no other var is set
2009-02-18 20:15:32 +0100 kz r268254 : #i93329# use soffice also for mac
2009-02-18 15:16:23 +0100 kz r268228 : #i84720# external installation fixed
Diffstat (limited to 'smoketestoo_native/com')
-rwxr-xr-x | smoketestoo_native/com/sun/star/comp/smoketest/makefile.mk | 45 |
1 files changed, 19 insertions, 26 deletions
diff --git a/smoketestoo_native/com/sun/star/comp/smoketest/makefile.mk b/smoketestoo_native/com/sun/star/comp/smoketest/makefile.mk index 7b427a325b4f..d111eacbd349 100755 --- a/smoketestoo_native/com/sun/star/comp/smoketest/makefile.mk +++ b/smoketestoo_native/com/sun/star/comp/smoketest/makefile.mk @@ -2,14 +2,12 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2009 by Sun Microsystems, Inc. # # OpenOffice.org - a multi-platform office productivity suite # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.4 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify @@ -29,7 +27,7 @@ # #************************************************************************* -PRJ = ..$/..$/..$/..$/.. +PRJ = ..$/..$/..$/..$/.. PRJNAME = smoke_test PACKAGE = com$/sun$/star$/comp$/smoketest TARGET = com_sun_star_comp_smoketest @@ -43,8 +41,8 @@ no_common_build_zip:=TRUE JARFILES = ridl.jar jurt.jar unoil.jar juh.jar -JARTARGET = TestExtension.jar -JARCOMPRESS = TRUE +JARTARGET = TestExtension.jar +JARCOMPRESS = TRUE CUSTOMMANIFESTFILE = MANIFEST.MF ZIP1TARGET=TestExtension @@ -55,34 +53,29 @@ ZIP1EXT=.oxt # --- Files -------------------------------------------------------- -COPY_OXT_MANIFEST:= $(MISC)$/$(TARGET)$/META-INF$/manifest.xml +#COPY_OXT_MANIFEST:= $(MISC)$/$(TARGET)$/META-INF$/manifest.xml JAVAFILES = TestExtension.java # --- Targets ------------------------------------------------------ -.INCLUDE : target.mk - -$(JARTARGETN) : $(MISC)$/$(TARGET).javamaker.done - -$(JAVACLASSFILES) : $(MISC)$/$(TARGET).javamaker.done +ZIP1DEPS=$(MISC)$/$(TARGET)$/$(JARTARGET)\ + $(MISC)$/$(TARGET)$/TestExtension.rdb\ + $(MISC)$/$(TARGET)$/META-INF$/manifest.xml -$(MISC)$/$(TARGET).javamaker.done: $(BIN)$/TestExtension.rdb - $(JAVAMAKER) -O$(CLASSDIR) -BUCR -nD -X$(SOLARBINDIR)/types.rdb $< - $(TOUCH) $@ +.INCLUDE : target.mk -$(BIN)$/TestExtension.rdb: TestExtension.idl +$(MISC)$/TestExtension.urd: TestExtension.idl $(IDLC) -O$(MISC) -I$(SOLARIDLDIR) -cid -we $< - -$(RM) $@ - $(REGMERGE) $@ /UCR $(MISC)$/TestExtension.urd -$(MISC)$/$(ZIP1TARGET).createdir : - $(MKDIRHIER) $(MISC)$/$(TARGET)$/META-INF >& $(NULLDEV) && $(TOUCH) $@ +$(MISC)$/$(TARGET)$/META-INF$/manifest.xml: manifest.xml + @-$(MKDIRHIER) $(@:d) + $(COPY) $< $@ -$(MISC)$/$(TARGET)_resort : manifest.xml $(JARTARGETN) $(MISC)$/$(ZIP1TARGET).createdir $(BIN)$/TestExtension.rdb - $(GNUCOPY) -u manifest.xml $(MISC)$/$(TARGET)$/META-INF$/manifest.xml - $(GNUCOPY) -u $(JARTARGETN) $(MISC)$/$(TARGET)$/$(JARTARGET) - $(GNUCOPY) -u $(BIN)$/TestExtension.rdb $(MISC)$/$(TARGET)$/TestExtension.rdb - $(TOUCH) $@ +$(MISC)$/$(TARGET)$/TestExtension.rdb: $(MISC)$/TestExtension.urd + $(REGMERGE) $@ /UCR $< -$(ZIP1TARGETN) : $(MISC)$/$(TARGET)_resort $(MISC)$/$(ZIP1TARGET).createdir +$(JAVACLASSFILES) .UPDATEALL: $(MISC)$/$(TARGET)$/TestExtension.rdb + $(JAVAMAKER) -O$(CLASSDIR) -BUCR -nD -X$(SOLARBINDIR)/types.rdb $< +$(MISC)$/$(TARGET)$/$(JARTARGET) : $(JARTARGETN) + $(COPY) $< $@ |