#82295# comparison works now on all platforms

4 files changed, 35 insertions, 19 deletions

diff --git a/odk/pack/checkbin/makefile.mk b/odk/pack/checkbin/makefile.mk
index b1822342946f..b90016d4d879 100644
--- a/odk/pack/checkbin/makefile.mk
+++ b/odk/pack/checkbin/makefile.mk
@@ -6,10 +6,14 @@ TARGET=checkbin
 .INCLUDE: settings.mk
 .INCLUDE: $(PRJ)$/util$/makefile.pmk
 #----------------------------------------------------------------
-ODKCHECKFILE=..$/misc$/$(TARGET).txt
+ODKCHECKFILE=$(MISC)$/$(TARGET).txt
 
 all: checkit
 
 checkit:
-    diff -r $(DESTDIRBIN)  $(SOLARBINDIR) |& $(PERL) $(PRJ)$/util$/checkdiff.pl
-     diff -r $(DESTDIRLIB)  $(SOLARLIBDIR) |& $(PERL) $(PRJ)$/util$/checkdiff.pl
+    +touch $(ODKCHECKFILE)
+# THE PERL SCRIPT DELETES THE CHECK FILE, WHEN AN ERROR OCCURS
+    -diff -r $(DESTDIRBIN)  $(SOLARBINDIR) |& $(PERL) $(PRJ)$/util$/checkdiff.pl $(ODKCHECKFILE)
+     -diff -r $(DESTDIRLIB)  $(SOLARLIBDIR) |& $(PERL) $(PRJ)$/util$/checkdiff.pl $(ODKCHECKFILE)
+# RAISE AN ERROR WHEN TAG FILE IS NOT THERE ANYMORE
+    cat $(ODKCHECKFILE)
\ No newline at end of file
diff --git a/odk/pack/checkinc/makefile.mk b/odk/pack/checkinc/makefile.mk
index b37e4774425d..d597bdb2f16b 100644
--- a/odk/pack/checkinc/makefile.mk
+++ b/odk/pack/checkinc/makefile.mk
@@ -6,14 +6,18 @@ TARGET=checkinc
 .INCLUDE: settings.mk
 .INCLUDE: $(PRJ)$/util$/makefile.pmk
 #----------------------------------------------------------------
-ODKCHECKFILE=..$/misc$/$(TARGET).txt
+ODKCHECKFILE=$(MISC)$/$(TARGET).txt
 
 all : checkit
 
 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
+    +touch $(ODKCHECKFILE)
+# THE PERL SCRIPT DELETES THE CHECK FILE, WHEN AN ERROR OCCURS
+    diff -r $(DESTDIRINC)$/osl   $(SOLARINCDIR)$/osl |& $(PERL) $(PRJ)$/util$/checkdiff.pl $(ODKCHECKFILE)
+       diff -r $(DESTDIRINC)$/rtl   $(SOLARINCDIR)$/rtl |& $(PERL) $(PRJ)$/util$/checkdiff.pl $(ODKCHECKFILE)
+       diff -r $(DESTDIRINC)$/sal   $(SOLARINCDIR)$/sal |& $(PERL) $(PRJ)$/util$/checkdiff.pl $(ODKCHECKFILE)
+#   	diff -r $(DESTDIRINC)$/stl   $(SOLARINCDIR)$/stl |& $(PERL) $(PRJ)$/util$/checkdiff.pl $(ODKCHECKFILE)
+       diff -r $(DESTDIRINC)$/store $(SOLARINCDIR)$/store |& $(PERL) $(PRJ)$/util$/checkdiff.pl $(ODKCHECKFILE)
+       diff -r $(DESTDIRINC)$/vos   $(SOLARINCDIR)$/vos |& $(PERL) $(PRJ)$/util$/checkdiff.pl $(ODKCHECKFILE)
+# RAISE AN ERROR WHEN TAG FILE IS NOT THERE ANYMORE
+    cat $(ODKCHECKFILE)
\ No newline at end of file
diff --git a/odk/pack/checkinc2/makefile.mk b/odk/pack/checkinc2/makefile.mk
index a56a67aee03f..391590535c98 100644
--- a/odk/pack/checkinc2/makefile.mk
+++ b/odk/pack/checkinc2/makefile.mk
@@ -6,14 +6,18 @@ TARGET=checkinc2
 .INCLUDE: settings.mk
 .INCLUDE: $(PRJ)$/util$/makefile.pmk
 #----------------------------------------------------------------
-ODKCHECKFILE=..$/misc$/$(TARGET).txt
+ODKCHECKFILE=$(MISC)$/$(TARGET).txt
 
 all : checkit
 
 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
+    +touch $(ODKCHECKFILE)
+# THE PERL SCRIPT DELETES THE CHECK FILE, WHEN AN ERROR OCCURS
+    diff -r $(DESTDIRINC)$/typelib  $(SOLARINCDIR)$/typelib 	|& $(PERL) $(PRJ)$/util$/checkdiff.pl $(ODKCHECKFILE)
+    diff -r $(DESTDIRINC)$/uno   	$(SOLARINCDIR)$/uno 		|& $(PERL) $(PRJ)$/util$/checkdiff.pl $(ODKCHECKFILE)
+    diff -r $(DESTDIRINC)$/bridges  $(SOLARINCDIR)$/bridges 	|& $(PERL) $(PRJ)$/util$/checkdiff.pl $(ODKCHECKFILE)
+    diff -r $(DESTDIRINC)$/cppu   	$(SOLARINCDIR)$/cppu 		|& $(PERL) $(PRJ)$/util$/checkdiff.pl $(ODKCHECKFILE)
+    diff -r $(DESTDIRINC)$/com$/sun$/star$/uno   	$(SOLARINCDIR)$/com$/sun$/star$/uno 	|& $(PERL) $(PRJ)$/util$/checkdiff.pl $(ODKCHECKFILE)
+    diff -r $(DESTDIRINC)$/cppuhelper 		$(SOLARINCDIR)$/cppuhelper 		|& $(PERL) $(PRJ)$/util$/checkdiff.pl $(ODKCHECKFILE)
+# RAISE AN ERROR WHEN TAG FILE IS NOT THERE ANYMORE
+    cat $(ODKCHECKFILE)
\ No newline at end of file
diff --git a/odk/util/checkdiff.pl b/odk/util/checkdiff.pl
index 73d36c80baef..9f7c4bf0eb66 100644
--- a/odk/util/checkdiff.pl
+++ b/odk/util/checkdiff.pl
@@ -9,13 +9,17 @@ while( <STDIN> )
 {
     if( /^diff/ )
     {
-        print STDERR "files differ : ".substr( $_, 5 );
+        print STDERR "ERROR : files differ ".substr( $_, 5 );
         $return++;
     }
     if( /^Binary/ )
     {
-        print STDERR "$_";
+        print STDERR "ERROR : $_";
         $return++;
     }
 }
+if( $return != 0 )
+{
+    unlink "$ARGV[0]";
+}
 exit $return;