#82295 comparison works now on all platforms

odk/pack/checkbin/makefile.mk

@@ -10,10 +10,6 @@ ODKCHECKFILE=..$/misc$/$(TARGET).txt
 
 all: checkit
 
-checkit .SETDIR=$(DESTDIR)$/.. :
-     $(MY_DIRCMP) $(ODKNAME)$/bin $(SOLARBINDIR) > $(ODKCHECKFILE)
-     +$(PERL) $(CHECKSCRIPT) $(ODKCHECKFILE)
-     +$(RM) $(ODKCHECKFILE) >$(NULLDEV)
-     $(MY_DIRCMP) $(ODKNAME)$/lib $(SOLARLIBDIR) > $(ODKCHECKFILE)
-     +$(PERL) $(CHECKSCRIPT) $(ODKCHECKFILE)
-     +$(RM) $(ODKCHECKFILE) >$(NULLDEV)
+checkit:
+    diff -r $(DESTDIRBIN)  $(SOLARBINDIR) |& $(PERL) $(PRJ)$/util$/checkdiff.pl
+     diff -r $(DESTDIRLIB)  $(SOLARLIBDIR) |& $(PERL) $(PRJ)$/util$/checkdiff.pl

odk/pack/checkinc/makefile.mk

@@ -10,22 +10,10 @@ ODKCHECKFILE=..$/misc$/$(TARGET).txt
 
 all : checkit
 
-checkit .SETDIR=$(DESTDIR)$/.. :
-      $(MY_DIRCMP) $(ODKNAME)$/include$/osl $(SOLARINCDIR)$/osl > $(ODKCHECKFILE)
-      +$(PERL) $(CHECKSCRIPT) $(ODKCHECKFILE)
-      +$(RM) $(ODKCHECKFILE) >$(NULLDEV)
-      $(MY_DIRCMP) $(ODKNAME)$/include$/rtl $(SOLARINCDIR)$/rtl > $(ODKCHECKFILE)
-      +$(PERL) $(CHECKSCRIPT) $(ODKCHECKFILE)
-      +$(RM) $(ODKCHECKFILE) >$(NULLDEV)
-      $(MY_DIRCMP) $(ODKNAME)$/include$/sal $(SOLARINCDIR)$/sal > $(ODKCHECKFILE)
-      +$(PERL) $(CHECKSCRIPT) $(ODKCHECKFILE)
-      +$(RM) $(ODKCHECKFILE) >$(NULLDEV)
-#   	$(MY_DIRCMP) $(ODKNAME)$/include$/stl $(SOLARINCDIR)$/stl > $(ODKCHECKFILE)
-#   	+$(PERL) $(CHECKSCRIPT) $(ODKCHECKFILE)
-#   	+$(RM) $(ODKCHECKFILE) >$(NULLDEV)
-      $(MY_DIRCMP) $(ODKNAME)$/include$/store $(SOLARINCDIR)$/store > $(ODKCHECKFILE)
-      +$(PERL) $(CHECKSCRIPT) $(ODKCHECKFILE)
-      +$(RM) $(ODKCHECKFILE) >$(NULLDEV)
-      $(MY_DIRCMP) $(ODKNAME)$/include$/vos $(SOLARINCDIR)$/vos > $(ODKCHECKFILE)
-      +$(PERL) $(CHECKSCRIPT) $(ODKCHECKFILE)
-      +$(RM) $(ODKCHECKFILE) >$(NULLDEV)
+checkit :
+    diff -r $(DESTDIRINC)$/osl   $(SOLARINCDIR)$/osl |& $(PERL) $(PRJ)$/util$/checkdiff.pl
+       diff -r $(DESTDIRINC)$/rtl   $(SOLARINCDIR)$/rtl |& $(PERL) $(PRJ)$/util$/checkdiff.pl
+       diff -r $(DESTDIRINC)$/sal   $(SOLARINCDIR)$/sal |& $(PERL) $(PRJ)$/util$/checkdiff.pl
+#   	diff -r $(DESTDIRINC)$/stl   $(SOLARINCDIR)$/stl |& $(PERL) $(PRJ)$/util$/checkdiff.pl
+       diff -r $(DESTDIRINC)$/store $(SOLARINCDIR)$/store |& $(PERL) $(PRJ)$/util$/checkdiff.pl
+       diff -r $(DESTDIRINC)$/vos   $(SOLARINCDIR)$/vos |& $(PERL) $(PRJ)$/util$/checkdiff.pl

odk/pack/checkinc2/makefile.mk

@@ -10,22 +10,10 @@ ODKCHECKFILE=..$/misc$/$(TARGET).txt
 
 all : checkit
 
-checkit .SETDIR=$(DESTDIR)$/.. :
-      $(MY_DIRCMP) $(ODKNAME)$/include$/typelib $(SOLARINCDIR)$/typelib > $(ODKCHECKFILE)
-      +$(PERL) $(CHECKSCRIPT) $(ODKCHECKFILE)
-      +$(RM) $(ODKCHECKFILE) >$(NULLDEV)
-      $(MY_DIRCMP) $(ODKNAME)$/include$/uno $(SOLARINCDIR)$/uno > $(ODKCHECKFILE)
-      +$(PERL) $(CHECKSCRIPT) $(ODKCHECKFILE)
-      +$(RM) $(ODKCHECKFILE) >$(NULLDEV)
-      $(MY_DIRCMP) $(ODKNAME)$/include$/bridges $(SOLARINCDIR)$/bridges > $(ODKCHECKFILE)
+checkit :
+    diff -r $(DESTDIRINC)$/typelib  $(SOLARINCDIR)$/typelib 	|& $(PERL) $(PRJ)$/util$/checkdiff.pl
+    diff -r $(DESTDIRINC)$/uno   	$(SOLARINCDIR)$/uno 		|& $(PERL) $(PRJ)$/util$/checkdiff.pl
+    diff -r $(DESTDIRINC)$/bridges  $(SOLARINCDIR)$/bridges 	|& $(PERL) $(PRJ)$/util$/checkdiff.pl
+    diff -r $(DESTDIRINC)$/cppu   	$(SOLARINCDIR)$/cppu 		|& $(PERL) $(PRJ)$/util$/checkdiff.pl
+    diff -r $(DESTDIRINC)$/com$/sun$/star$/uno   	$(SOLARINCDIR)$/com$/sun$/star$/uno 	|& $(PERL) $(PRJ)$/util$/checkdiff.pl
+    diff -r $(DESTDIRINC)$/cppuhelper 		$(SOLARINCDIR)$/cppuhelper 		|& $(PERL) $(PRJ)$/util$/checkdiff.pl
\ No newline at end of file
-      +$(PERL) $(CHECKSCRIPT) $(ODKCHECKFILE)
-      +$(RM) $(ODKCHECKFILE) >$(NULLDEV)
-      $(MY_DIRCMP) $(ODKNAME)$/include$/com$/sun$/star$/uno $(SOLARINCDIR)$/com$/sun$/star$/uno > $(ODKCHECKFILE)
-      +$(PERL) $(CHECKSCRIPT) $(ODKCHECKFILE)
-      +$(RM) $(ODKCHECKFILE) >$(NULLDEV)
-      $(MY_DIRCMP) $(ODKNAME)$/include$/cppu $(SOLARINCDIR)$/cppu > $(ODKCHECKFILE)
-      +$(PERL) $(CHECKSCRIPT) $(ODKCHECKFILE)
-      +$(RM) $(ODKCHECKFILE) >$(NULLDEV)
-      $(MY_DIRCMP) $(ODKNAME)$/include$/cppuhelper $(SOLARINCDIR)$/cppuhelper > $(ODKCHECKFILE)
-      +$(PERL) $(CHECKSCRIPT) $(ODKCHECKFILE)
-      +$(RM) $(ODKCHECKFILE) >$(NULLDEV)

odk/util/checkdiff.pl

+#
+# checkit - a perl script to check the output of 'dircmp'
+#
+# Copyright (c) 2000 Sun Microsystems, Inc.
+#
+
+$return = 0;
+while( <STDIN> )
+{
+    if( /^diff/ )
+    {
+        print STDERR "files differ : ".substr( $_, 5 );
+        $return++;
+    }
+    if( /^Binary/ )
+    {
+        print STDERR "$_";
+        $return++;
+    }
+}
+exit $return;

odk/util/makefile.pmk

@@ -4,6 +4,7 @@ DESTDIR=$(OUT)$/bin$/$(ODKNAME)
 DESTDIRIDL=$(DESTDIR)$/idl
 DESTDIRSETTINGS=$(DESTDIR)$/settings
 DESTDIREXAMPLES=$(DESTDIR)$/examples$/cpp
+DESTDIRINC=$(DESTDIR)$/include
 
 UDKZIPPATH=$(SOLARBINDIR)
 UDKNAME=$(UDKSTAMP:l)
@@ -35,10 +36,14 @@ MY_TEXTCOPY_TARGETPRE=>
 
 .IF "$(OS)$(CPU)"=="SOLARISS"
 DESTDIRBIN=$(DESTDIR)$/bin$/solsparc
+DESTDIRLIB=$(DESTDIR)$/lib$/solsparc
 .ELIF "$(OS)$(CPU)"=="SOLARISI"
 DESTDIRBIN=$(DESTDIR)$/bin$/solia
+DESTDIRLIB=$(DESTDIR)$/lib$/solia
 .ELIF "$(OS)"=="LINUX"
 DESTDIRBIN=$(DESTDIR)$/bin$/linux
+DESTDIRLIB=$(DESTDIR)$/lib$/linux
 .ELIF "$(OS)"=="WNT"
 DESTDIRBIN=$(DESTDIR)$/bin$/windows
+DESTDIRLIB=$(DESTDIR)$/lib$/windows
 .ENDIF
\ No newline at end of file