Kaydet (Commit) e2b8cbef authored tarafından Michael Stahl's avatar Michael Stahl

odk: remove addsym-macosx.sh

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

Change-Id: Ifa6cab95be6575ac26840250ad717d94e15bea66
üst 3af7e5c3
......@@ -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) \
......
......@@ -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) \
......
# -*- 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:
#!/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 }'
......@@ -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++;
......
......@@ -121,15 +121,6 @@ File gid_File_Package_odk_lib
Styles = (FILELIST,USE_INTERNAL_RIGHTS);
End
#if defined(MACOSX)
File gid_File_Package_odk_macosx
TXT_FILE_BODY;
Dir = FILELIST_SDK_DIR;
Name = "odk_macosx.filelist";
Styles = (FILELIST,USE_INTERNAL_RIGHTS);
End
#endif
File gid_File_Package_odk_settings
TXT_FILE_BODY;
Dir = FILELIST_SDK_DIR;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment