From e2b8cbef51a999d1bac644dada174bdb9b126915 Mon Sep 17 00:00:00 2001
From: Michael Stahl <mstahl@redhat.com>
Date: Wed, 11 Sep 2013 17:44:52 +0200
Subject: odk: remove addsym-macosx.sh

This was added in commit 66eedcee026459b2827a46d8ebc73749e3c71453
but has apparently never actually been used in the bundled SDK
makefiles.

Change-Id: Ifa6cab95be6575ac26840250ad717d94e15bea66
---
 odk/CustomTarget_check.mk         |  1 -
 odk/Module_odk.mk                 |  6 ------
 odk/Package_macosx.mk             | 16 ----------------
 odk/pack/copying/addsym-macosx.sh | 28 ----------------------------
 odk/util/check.pl                 |  8 --------
 5 files changed, 59 deletions(-)
 delete mode 100644 odk/Package_macosx.mk
 delete mode 100755 odk/pack/copying/addsym-macosx.sh

(limited to 'odk')

diff --git a/odk/CustomTarget_check.mk b/odk/CustomTarget_check.mk
index ab6573e8bedb..e7d524450489 100644
--- a/odk/CustomTarget_check.mk
+++ b/odk/CustomTarget_check.mk
@@ -39,7 +39,6 @@ $(call gb_CustomTarget_get_workdir,odk/check)/checkbin : \
 		$(call gb_Package_get_target,odk_html) \
 		$(if $(ENABLE_JAVA),$(call gb_Package_get_target,odk_javadoc)) \
 		$(call gb_Package_get_target,odk_lib) \
-		$(if $(filter MACOSX,$(OS)),$(call gb_Package_get_target,odk_macosx)) \
 		$(call gb_Package_get_target,odk_settings) \
 		$(call gb_Package_get_target,odk_settings_generated) \
 		$(call gb_Package_get_target,odk_uno_loader_classes) \
diff --git a/odk/Module_odk.mk b/odk/Module_odk.mk
index ccbb93f86a1e..7dd0e20dcecb 100644
--- a/odk/Module_odk.mk
+++ b/odk/Module_odk.mk
@@ -43,12 +43,6 @@ $(eval $(call gb_Module_add_targets,odk,\
 ))
 endif
 
-ifeq ($(OS),MACOSX)
-$(eval $(call gb_Module_add_targets,odk,\
-	Package_macosx \
-))
-endif
-
 ifneq ($(ENABLE_JAVA),)
 $(eval $(call gb_Module_add_targets,odk,\
 	$(if $(filter YESGCC,$(BUILD_UNOWINREG)$(COM)),CustomTarget_unowinreg) \
diff --git a/odk/Package_macosx.mk b/odk/Package_macosx.mk
deleted file mode 100644
index 4ff35013e950..000000000000
--- a/odk/Package_macosx.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# 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/.
-#
-
-$(eval $(call gb_Package_Package,odk_macosx,$(SRCDIR)/odk/pack/copying))
-
-$(eval $(call gb_Package_set_outdir,odk_macosx,$(INSTDIR)))
-
-$(eval $(call gb_Package_add_file,odk_macosx,$(gb_Package_SDKDIRNAME)/bin/addsym-macosx.sh,addsym-macosx.sh))
-
-# vim: set noet sw=4 ts=4:
diff --git a/odk/pack/copying/addsym-macosx.sh b/odk/pack/copying/addsym-macosx.sh
deleted file mode 100755
index 46ad95908e09..000000000000
--- a/odk/pack/copying/addsym-macosx.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/sh
-#
-# 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 .
-#
-
-# This script is needed in the process of generating exported
-# symbols list on Mac OS X
-
-# Please note that the awk expression expects to get the output of 'nm -gx'!
-# On Panther we have to filter out symbols with a value "1f" otherwise external
-# symbols will erroneously be added to the generated export symbols list file.
-awk -v SYMBOLSREGEXP="^__ZTI.*$|^__ZTS.*$" '
-match ($6,SYMBOLSREGEXP) > 0 &&  $6 !~ /_GLOBAL_/ { if (($2 != 1) && ( $2 != "1f" ) ) print $6 }'
-
diff --git a/odk/util/check.pl b/odk/util/check.pl
index db0286bb5724..899b42cca0e8 100644
--- a/odk/util/check.pl
+++ b/odk/util/check.pl
@@ -70,14 +70,6 @@ if (-d "$SdkDir") {
         print "+";
         }
     }
-    if ($OperatingSystem eq "macosx") {
-        if (!check_file("bin/addsym-macosx.sh")) {
-        $return++;
-        print "\nERROR: \"bin/addsym-macosx.sh\" is missing\n";
-        } else {
-        print "+";
-        }
-    }
     } else {
         print "\nERROR: \"bin\" is missing\n";
         $return++;
-- 
cgit