summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2013-03-13 14:28:11 +0100
committerMichael Stahl <mstahl@redhat.com>2013-03-13 14:33:55 +0100
commit5c57a102efb261975b89729e4e4042c5848af174 (patch)
tree1e4c158a80d5326ac2f7d71a88e8feaaf152cf04
parentbbe23a0137a0bb18beb94ba6754f24cf369f1dde (diff)
odk: remove the "checkinc" too
This tests for problems that cannot happen any more since we now build the Zip file from the same enumeration as the delivered headers, so they cannot be different. Change-Id: I0aacb2b8b1b6f187674b3a16b0fe7cb474e1b8c7
-rw-r--r--odk/CustomTarget_check.mk16
-rw-r--r--odk/util/checkdiff.pl53
2 files changed, 0 insertions, 69 deletions
diff --git a/odk/CustomTarget_check.mk b/odk/CustomTarget_check.mk
index eaa7c0c7240f..cdc83dcce4a5 100644
--- a/odk/CustomTarget_check.mk
+++ b/odk/CustomTarget_check.mk
@@ -11,7 +11,6 @@ $(eval $(call gb_CustomTarget_CustomTarget,odk/check))
$(eval $(call gb_CustomTarget_register_targets,odk/check,\
checkbin \
- checkinc \
))
odk_PLATFORM := $(if $(filter WNT,$(OS)),\
@@ -33,19 +32,4 @@ $(call gb_CustomTarget_get_workdir,odk/check)/checkbin: $(SRCDIR)/odk/util/check
$(odk_PLATFORM) "$(gb_Exectable_EXT)" $@
cat $@
-$(call gb_CustomTarget_get_workdir,odk/check)/checkinc: $(SRCDIR)/odk/util/checkdiff.pl $(call gb_CustomTarget_get_target,odk/odkcommon)
- $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CHK,1)
- touch $@
- diff -br $(call gb_CustomTarget_get_workdir,odk/odkcommon)/include/osl \ $(OUTDIR)/inc/osl 2>&1 | $(PERL) $< $@
- diff -br $(call gb_CustomTarget_get_workdir,odk/odkcommon)/include/sal \ $(OUTDIR)/inc/sal 2>&1 | $(PERL) $< $@
- diff -br $(call gb_CustomTarget_get_workdir,odk/odkcommon)/include/store \ $(OUTDIR)/inc/store 2>&1 | $(PERL) $< $@
- diff -br $(call gb_CustomTarget_get_workdir,odk/odkcommon)/include/typelib \ $(OUTDIR)/inc/typelib 2>&1 | $(PERL) $< $@
- diff -br $(call gb_CustomTarget_get_workdir,odk/odkcommon)/include/uno \ $(OUTDIR)/inc/uno 2>&1 | $(PERL) $< $@
- diff -br $(call gb_CustomTarget_get_workdir,odk/odkcommon)/include/bridges \ $(OUTDIR)/inc/bridges 2>&1 | $(PERL) $< $@
- diff -br $(call gb_CustomTarget_get_workdir,odk/odkcommon)/include/cppu \ $(OUTDIR)/inc/cppu 2>&1 | $(PERL) $< $@
- diff -br $(call gb_CustomTarget_get_workdir,odk/odkcommon)/include/com/sun/star/uno \ $(OUTDIR)/inc/com/sun/star/uno 2>&1 | $(PERL) $< $@
- diff -br $(call gb_CustomTarget_get_workdir,odk/odkcommon)/include/cppuhelper \ $(OUTDIR)/inc/cppuhelper 2>&1 | $(PERL) $< $@
- diff -br $(call gb_CustomTarget_get_workdir,odk/odkcommon)/include/osl \ $(OUTDIR)/inc/osl 2>&1 | $(PERL) $< $@
- cat $@
-
# vim: set noet sw=4 ts=4:
diff --git a/odk/util/checkdiff.pl b/odk/util/checkdiff.pl
deleted file mode 100644
index ca70815a558d..000000000000
--- a/odk/util/checkdiff.pl
+++ /dev/null
@@ -1,53 +0,0 @@
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed
-# with this work for additional information regarding copyright
-# ownership. The ASF licenses this file to you under the Apache
-# License, Version 2.0 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.apache.org/licenses/LICENSE-2.0 .
-#
-
-#
-# checkit - a perl script to check the output of 'dircmp'
-#
-
-$return = 0;
-$possible_error = 0;
-$possible_error_descript = "";
-while( <STDIN> )
-{
- if( /^diff/ )
- {
- $possible_error = 1;
- $possible_error_descript = $_;
- }
- elsif( /^Binary/ )
- {
- print STDERR "ERROR : $_";
- $return++;
- }
- elsif( /^[0-9]/ && $possible_error == 1 )
- {
- print STDERR "ERROR : diff ".$possible_error_descript;
- $return++;
- $possible_error = 0;
- }
- else
- {
- $possible_error = 0;
- }
-}
-if( $return != 0 )
-{
- unlink "$ARGV[0]";
-}
-exit $return;