summaryrefslogtreecommitdiff
path: root/odk/pack
diff options
context:
space:
mode:
authorKurt Zenker <kz@openoffice.org>2006-07-05 20:53:47 +0000
committerKurt Zenker <kz@openoffice.org>2006-07-05 20:53:47 +0000
commit1cd1bf882000b310109fee315e974022bf839c2d (patch)
tree92b88248f3268342b4b96785867727e0b2b36aca /odk/pack
parent463346fa3c0f4ab9fe1fe714a50bac032c6b434c (diff)
INTEGRATION: CWS ause058 (1.8.46); FILE MERGED
2006/06/28 13:34:22 hjs 1.8.46.1: #i58351# more piping
Diffstat (limited to 'odk/pack')
-rw-r--r--odk/pack/checkinc/makefile.mk16
-rw-r--r--odk/pack/checkinc2/makefile.mk16
2 files changed, 16 insertions, 16 deletions
diff --git a/odk/pack/checkinc/makefile.mk b/odk/pack/checkinc/makefile.mk
index 51af372ca5b3..9790ae3fd794 100644
--- a/odk/pack/checkinc/makefile.mk
+++ b/odk/pack/checkinc/makefile.mk
@@ -4,9 +4,9 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.8 $
+# $Revision: 1.9 $
#
-# last change: $Author: rt $ $Date: 2005-09-07 20:16:30 $
+# last change: $Author: kz $ $Date: 2006-07-05 21:53:35 $
#
# The Contents of this file are made available subject to
# the terms of GNU Lesser General Public License Version 2.1.
@@ -47,11 +47,11 @@ all : $(ODKCHECKFILE)
$(ODKCHECKFILE) : $(SDK_CONTENT_CHECK_FILES)
+@echo "" > $(ODKCHECKFILE)
# THE PERL SCRIPT DELETES THE CHECK FILE, WHEN AN ERROR OCCURS
- -diff -br $(DESTDIRINC)$/osl $(SOLARINCDIR)$/osl |& $(PERL) $(PRJ)$/util$/checkdiff.pl $(ODKCHECKFILE)
- -diff -br $(DESTDIRINC)$/rtl $(SOLARINCDIR)$/rtl |& $(PERL) $(PRJ)$/util$/checkdiff.pl $(ODKCHECKFILE)
- -diff -br $(DESTDIRINC)$/sal $(SOLARINCDIR)$/sal |& $(PERL) $(PRJ)$/util$/checkdiff.pl $(ODKCHECKFILE)
- -diff -br $(DESTDIRINC)$/stl $(SOLARINCDIR)$/stl |& $(PERL) $(PRJ)$/util$/checkdiff.pl $(ODKCHECKFILE)
- -diff -br $(DESTDIRINC)$/store $(SOLARINCDIR)$/store |& $(PERL) $(PRJ)$/util$/checkdiff.pl $(ODKCHECKFILE)
- -diff -br $(DESTDIRINC)$/vos $(SOLARINCDIR)$/vos |& $(PERL) $(PRJ)$/util$/checkdiff.pl $(ODKCHECKFILE)
+ -diff -br $(DESTDIRINC)$/osl $(SOLARINCDIR)$/osl $(PIPEERROR) $(PERL) $(PRJ)$/util$/checkdiff.pl $(ODKCHECKFILE)
+ -diff -br $(DESTDIRINC)$/rtl $(SOLARINCDIR)$/rtl $(PIPEERROR) $(PERL) $(PRJ)$/util$/checkdiff.pl $(ODKCHECKFILE)
+ -diff -br $(DESTDIRINC)$/sal $(SOLARINCDIR)$/sal $(PIPEERROR) $(PERL) $(PRJ)$/util$/checkdiff.pl $(ODKCHECKFILE)
+ -diff -br $(DESTDIRINC)$/stl $(SOLARINCDIR)$/stl $(PIPEERROR) $(PERL) $(PRJ)$/util$/checkdiff.pl $(ODKCHECKFILE)
+ -diff -br $(DESTDIRINC)$/store $(SOLARINCDIR)$/store $(PIPEERROR) $(PERL) $(PRJ)$/util$/checkdiff.pl $(ODKCHECKFILE)
+ -diff -br $(DESTDIRINC)$/vos $(SOLARINCDIR)$/vos $(PIPEERROR) $(PERL) $(PRJ)$/util$/checkdiff.pl $(ODKCHECKFILE)
# RAISE AN ERROR WHEN TAG FILE IS NOT THERE ANYMORE
cat $(ODKCHECKFILE)
diff --git a/odk/pack/checkinc2/makefile.mk b/odk/pack/checkinc2/makefile.mk
index 993959631289..e320a1bb897b 100644
--- a/odk/pack/checkinc2/makefile.mk
+++ b/odk/pack/checkinc2/makefile.mk
@@ -4,9 +4,9 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.8 $
+# $Revision: 1.9 $
#
-# last change: $Author: rt $ $Date: 2005-09-07 20:16:47 $
+# last change: $Author: kz $ $Date: 2006-07-05 21:53:47 $
#
# The Contents of this file are made available subject to
# the terms of GNU Lesser General Public License Version 2.1.
@@ -47,11 +47,11 @@ all : $(ODKCHECKFILE)
$(ODKCHECKFILE) : $(SDK_CONTENT_CHECK_FILES)
+@echo "" > $(ODKCHECKFILE)
# THE PERL SCRIPT DELETES THE CHECK FILE, WHEN AN ERROR OCCURS
- -diff -br $(DESTDIRINC)$/typelib $(SOLARINCDIR)$/typelib |& $(PERL) $(PRJ)$/util$/checkdiff.pl $(ODKCHECKFILE)
- -diff -br $(DESTDIRINC)$/uno $(SOLARINCDIR)$/uno |& $(PERL) $(PRJ)$/util$/checkdiff.pl $(ODKCHECKFILE)
- -diff -br $(DESTDIRINC)$/bridges $(SOLARINCDIR)$/bridges |& $(PERL) $(PRJ)$/util$/checkdiff.pl $(ODKCHECKFILE)
- -diff -br $(DESTDIRINC)$/cppu $(SOLARINCDIR)$/cppu |& $(PERL) $(PRJ)$/util$/checkdiff.pl $(ODKCHECKFILE)
- -diff -br $(DESTDIRINC)$/com$/sun$/star$/uno $(SOLARINCDIR)$/com$/sun$/star$/uno |& $(PERL) $(PRJ)$/util$/checkdiff.pl $(ODKCHECKFILE)
- -diff -br $(DESTDIRINC)$/cppuhelper $(SOLARINCDIR)$/cppuhelper |& $(PERL) $(PRJ)$/util$/checkdiff.pl $(ODKCHECKFILE)
+ -diff -br $(DESTDIRINC)$/typelib $(SOLARINCDIR)$/typelib $(PIPEERROR) $(PERL) $(PRJ)$/util$/checkdiff.pl $(ODKCHECKFILE)
+ -diff -br $(DESTDIRINC)$/uno $(SOLARINCDIR)$/uno $(PIPEERROR) $(PERL) $(PRJ)$/util$/checkdiff.pl $(ODKCHECKFILE)
+ -diff -br $(DESTDIRINC)$/bridges $(SOLARINCDIR)$/bridges $(PIPEERROR) $(PERL) $(PRJ)$/util$/checkdiff.pl $(ODKCHECKFILE)
+ -diff -br $(DESTDIRINC)$/cppu $(SOLARINCDIR)$/cppu $(PIPEERROR) $(PERL) $(PRJ)$/util$/checkdiff.pl $(ODKCHECKFILE)
+ -diff -br $(DESTDIRINC)$/com$/sun$/star$/uno $(SOLARINCDIR)$/com$/sun$/star$/uno $(PIPEERROR) $(PERL) $(PRJ)$/util$/checkdiff.pl $(ODKCHECKFILE)
+ -diff -br $(DESTDIRINC)$/cppuhelper $(SOLARINCDIR)$/cppuhelper $(PIPEERROR) $(PERL) $(PRJ)$/util$/checkdiff.pl $(ODKCHECKFILE)
# RAISE AN ERROR WHEN TAG FILE IS NOT THERE ANYMORE
cat $(ODKCHECKFILE)