odk/CustomTarget_check.mk | 1 odk/CustomTarget_doxygen.mk | 15 odk/CustomTarget_javadoc.mk | 4 odk/CustomTarget_settings.mk | 2 odk/Module_odk.mk | 6 odk/Package_macosx.mk | 16 odk/docs/cpp/Doxyfile | 39 odk/docs/cpp/main.dox | 11 odk/docs/idl/Doxyfile | 48 odk/docs/idl/generated_idl_chapter_refs.idl | 5589 +++++++++++++++ odk/docs/idl/idl_chapter_refs.txt | 7336 ++++++++++++++++++++ odk/docs/idl/main.dox | 11 odk/docs/idl/wikilinks.py | 67 odk/docs/java-uno/package-list | 47 odk/docs/java/package-list | 135 odk/pack/copying/addsym-macosx.sh | 28 odk/pack/copying/dk.mk | 4 odk/pack/copying/idl_chapter_refs.txt | 7336 -------------------- odk/pack/gendocu/Doxyfile | 39 odk/pack/gendocu/idl/Doxyfile | 48 odk/pack/gendocu/idl/generated_idl_chapter_refs.idl | 5589 --------------- odk/pack/gendocu/idl/main.dox | 11 odk/pack/gendocu/idl/wikilinks.py | 67 odk/pack/gendocu/java/package-list | 135 odk/pack/gendocu/main.dox | 11 odk/pack/gendocu/uno/package-list | 47 odk/settings/dk.mk | 4 odk/util/check.pl | 8 scp2/source/sdkoo/sdkoo.scp | 9 solenv/bin/addsym-macosx.sh | 68 30 files changed, 13298 insertions(+), 13433 deletions(-)
New commits: commit 960aee493a7bdbda69cbe60049edd9c4cafaab8e Author: Michael Stahl <[email protected]> Date: Wed Sep 11 18:18:51 2013 +0200 odk: move files out of the confusing "pack" directory to better homes Change-Id: I46f4954ef07f60e1f7824a47f0617f8612ea9505 diff --git a/odk/CustomTarget_doxygen.mk b/odk/CustomTarget_doxygen.mk index fe60a6b..9be0fad 100644 --- a/odk/CustomTarget_doxygen.mk +++ b/odk/CustomTarget_doxygen.mk @@ -25,7 +25,8 @@ odk_cpp_INCFILELIST := com/sun/star/uno/Any.h \ # Cygwin Doxygen needs unix paths odk_cygwin_path = $(if $(filter WNT,$(OS)),$(shell cygpath -u $(1)),$(1)) odk_cpp_PREFIX := $(INSTDIR)/$(gb_Package_SDKDIRNAME)/include/ -odk_cpp_DOXY_INPUT := $(SRCDIR)/odk/pack/gendocu/main.dox $(SRCDIR)/include/sal/log-areas.dox \ +odk_cpp_DOXY_INPUT := $(SRCDIR)/odk/docs/cpp/main.dox \ + $(SRCDIR)/include/sal/log-areas.dox \ $(addprefix $(odk_cpp_PREFIX),$(odk_cpp_INCDIRLIST) $(odk_cpp_INCFILELIST)) odk_cpp_DOXY_WORKDIR := $(call gb_CustomTarget_get_workdir,odk/docs/cpp)/ref @@ -35,7 +36,7 @@ $(eval $(call gb_CustomTarget_register_targets,odk/docs,\ )) $(call gb_CustomTarget_get_workdir,odk/docs)/cpp/Doxyfile : \ - $(SRCDIR)/odk/pack/gendocu/Doxyfile \ + $(SRCDIR)/odk/docs/cpp/Doxyfile \ $(gb_Module_CURRENTMAKEFILE) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),SED,1) sed -e 's!^INPUT = %$$!INPUT = $(call odk_cygwin_path,$(odk_cpp_DOXY_INPUT))!' \ @@ -49,7 +50,7 @@ $(call gb_CustomTarget_get_workdir,odk/docs)/cpp/Doxyfile : \ $(call gb_CustomTarget_get_workdir,odk/docs)/cpp/doxygen.log : \ $(call gb_CustomTarget_get_workdir,odk/docs)/cpp/Doxyfile \ $(SRCDIR)/include/sal/log-areas.dox \ - $(SRCDIR)/odk/pack/gendocu/main.dox \ + $(SRCDIR)/odk/docs/cpp/main.dox \ $(call gb_PackageSet_get_target,odk_headers) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),GEN,1) rm -rf $(odk_cpp_DOXY_WORKDIR)/ && $(DOXYGEN) $< > $@ @@ -62,15 +63,15 @@ $(eval $(call gb_CustomTarget_register_targets,odk/docs,\ odk_idl_PREFIX := $(SRCDIR)/udkapi/ $(SRCDIR)/offapi/ # note: generated_idl_chapter_refs.idl must be the _last_ input file! # otherwise spurious references to it will appear in the output -odk_idl_DOXY_INPUT := $(SRCDIR)/odk/pack/gendocu/idl/main.dox \ +odk_idl_DOXY_INPUT := $(SRCDIR)/odk/docs/idl/main.dox \ $(addsuffix com,$(odk_idl_PREFIX)) \ - $(SRCDIR)/odk/pack/gendocu/idl/generated_idl_chapter_refs.idl + $(SRCDIR)/odk/docs/idl/generated_idl_chapter_refs.idl odk_idl_DOXY_WORKDIR := $(call gb_CustomTarget_get_workdir,odk/docs/idl)/ref # don't depend on the IDL files directly but instead on the udkapi/offapi # which will get rebuilt when any IDL file changes $(call gb_CustomTarget_get_workdir,odk/docs)/idl/Doxyfile : \ - $(SRCDIR)/odk/pack/gendocu/idl/Doxyfile \ + $(SRCDIR)/odk/docs/idl/Doxyfile \ $(call gb_UnoApi_get_target,udkapi) \ $(call gb_UnoApi_get_target,offapi) \ $(gb_Module_CURRENTMAKEFILE) @@ -86,7 +87,7 @@ $(call gb_CustomTarget_get_workdir,odk/docs)/idl/Doxyfile : \ $(call gb_CustomTarget_get_workdir,odk/docs)/idl/doxygen.log : \ $(call gb_CustomTarget_get_workdir,odk/docs)/idl/Doxyfile \ - $(SRCDIR)/odk/pack/gendocu/idl/main.dox + $(SRCDIR)/odk/docs/idl/main.dox $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),GEN,1) rm -rf $(odk_idl_DOXY_WORKDIR)/ && $(DOXYGEN) $< > $@ diff --git a/odk/CustomTarget_javadoc.mk b/odk/CustomTarget_javadoc.mk index 93527a9..5527fe3 100644 --- a/odk/CustomTarget_javadoc.mk +++ b/odk/CustomTarget_javadoc.mk @@ -37,8 +37,8 @@ $(call gb_CustomTarget_get_workdir,odk/docs/java/ref)/javadoc_log.txt : $(call g -d $(dir $@) \ -sourcepath "$(SRCDIR)/ridljar/source/unoloader$(gb_CLASSPATHSEP)$(SRCDIR)/ridljar$(gb_CLASSPATHSEP)$(SRCDIR)/jurt$(gb_CLASSPATHSEP)$(SRCDIR)/javaunohelper" \ -classpath $(OUTDIR)/bin/ridl.jar \ - -linkoffline ../../common/reg $(SRCDIR)/odk/pack/gendocu/uno \ - -linkoffline http://java.sun.com/j2se/1.5/docs/api $(SRCDIR)/odk/pack/gendocu/java \ + -linkoffline ../../common/reg $(SRCDIR)/odk/docs/java-uno \ + -linkoffline http://java.sun.com/j2se/1.5/docs/api $(SRCDIR)/odk/docs/java \ $(odk_JAVAPACKAGES) \ $(if $(JAVADOCISGJDOC),,-notimestamp) \ > $@ diff --git a/odk/CustomTarget_settings.mk b/odk/CustomTarget_settings.mk index 242dd68..2a0d6e4 100644 --- a/odk/CustomTarget_settings.mk +++ b/odk/CustomTarget_settings.mk @@ -11,7 +11,7 @@ $(eval $(call gb_CustomTarget_CustomTarget,odk/settings)) $(eval $(call gb_CustomTarget_register_target,odk/settings,dk.mk)) -$(call gb_CustomTarget_get_workdir,odk/settings)/dk.mk : $(SRCDIR)/odk/pack/copying/dk.mk +$(call gb_CustomTarget_get_workdir,odk/settings)/dk.mk : $(SRCDIR)/odk/settings/dk.mk $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,SED,1) tr -d "\015" < $< | sed -e 's/@@RELEASE@@/$(PRODUCTVERSION)/' \ -e 's/@@BUILDID@@/$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)/' \ diff --git a/odk/pack/gendocu/Doxyfile b/odk/docs/cpp/Doxyfile similarity index 100% rename from odk/pack/gendocu/Doxyfile rename to odk/docs/cpp/Doxyfile diff --git a/odk/pack/gendocu/main.dox b/odk/docs/cpp/main.dox similarity index 100% rename from odk/pack/gendocu/main.dox rename to odk/docs/cpp/main.dox diff --git a/odk/pack/gendocu/idl/Doxyfile b/odk/docs/idl/Doxyfile similarity index 100% rename from odk/pack/gendocu/idl/Doxyfile rename to odk/docs/idl/Doxyfile diff --git a/odk/pack/gendocu/idl/generated_idl_chapter_refs.idl b/odk/docs/idl/generated_idl_chapter_refs.idl similarity index 100% rename from odk/pack/gendocu/idl/generated_idl_chapter_refs.idl rename to odk/docs/idl/generated_idl_chapter_refs.idl diff --git a/odk/pack/copying/idl_chapter_refs.txt b/odk/docs/idl/idl_chapter_refs.txt similarity index 100% rename from odk/pack/copying/idl_chapter_refs.txt rename to odk/docs/idl/idl_chapter_refs.txt diff --git a/odk/pack/gendocu/idl/main.dox b/odk/docs/idl/main.dox similarity index 100% rename from odk/pack/gendocu/idl/main.dox rename to odk/docs/idl/main.dox diff --git a/odk/pack/gendocu/idl/wikilinks.py b/odk/docs/idl/wikilinks.py similarity index 100% rename from odk/pack/gendocu/idl/wikilinks.py rename to odk/docs/idl/wikilinks.py diff --git a/odk/pack/gendocu/uno/package-list b/odk/docs/java-uno/package-list similarity index 100% rename from odk/pack/gendocu/uno/package-list rename to odk/docs/java-uno/package-list diff --git a/odk/pack/gendocu/java/package-list b/odk/docs/java/package-list similarity index 100% rename from odk/pack/gendocu/java/package-list rename to odk/docs/java/package-list diff --git a/odk/pack/copying/dk.mk b/odk/settings/dk.mk similarity index 100% rename from odk/pack/copying/dk.mk rename to odk/settings/dk.mk commit 01c2ed9f6deaabee0dbab0f7bdac1b49af23b51b Author: Michael Stahl <[email protected]> Date: Wed Sep 11 17:46:15 2013 +0200 solenv: remove other addsym-macosx.sh too Unnecessary since gbuild does not use map files on Mac OS X. Change-Id: I2d3ae95634a5c4fe925f391ea37b62f73d2f1524 diff --git a/solenv/bin/addsym-macosx.sh b/solenv/bin/addsym-macosx.sh deleted file mode 100755 index b7bcbb8..0000000 --- a/solenv/bin/addsym-macosx.sh +++ /dev/null @@ -1,68 +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 out of map files on Mac OS X (see also #i69351#) -# The magic generating the regular expression from the temporary -# mapfile containing only star and question mark symbols -# -# The script has to be called as follows: -# nm -gx <file>.o | addsym-macosx.sh <file-with-wildcard-symbols> <temporary-file-where-to-write-the-search-expression-to> -# See tg_shl.mk for an example of how to use the script -# -# Replace every * with .* and every ? with . to get awk expression -# Put ^ at the beginning of every expression -# Put $ at the beginning of every expression -# Connect them all on one line, separated by | -# Remove | at the end of this regular expression because the last end -# of line was also replaced by | - -cat $1 | sed 's#*#.*#g -s#?#.#g -s#^#^# -s#$#$#' | tr '\n' '|' | sed "s#|\$##" >$2 - -# Please note that the awk expression expects to get the output of 'nm -gx'! - -# The fields in the nm -gx output are apparently (see -# /usr/include/mach-o/nlist.h>): - -# xxxxxxxx xx xx xxxx xxxxxxxx symbol -# ! ! ! ! n_value -# ! ! ! n_desc -# ! ! n_sect -# ! n_type -# n_strx - -# Original comment: -# 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. -# -# Of course it isn't actually the "value" (n_value) of the symbol that -# is meant, but (as is seen from the use of $2) the n_type . -# -# Now, what does a n_type of 1f actually mean? The N_PEXT bit (0x10) -# is on and the N_EXT (0x01) bit is on. It is what in Mach-O -# documentation is called "private external". This includes symbols -# produced by using -fvisibility=hidden. Whether that is a problem I -# don't know. -# -awk -v SYMBOLSREGEXP="`cat $2`" ' -match ($6,SYMBOLSREGEXP) > 0 && $6 !~ /_GLOBAL_/ { if (($2 != 1) && ( $2 != "1f" ) ) print $6 }' - commit e2b8cbef51a999d1bac644dada174bdb9b126915 Author: Michael Stahl <[email protected]> Date: Wed Sep 11 17:44:52 2013 +0200 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 diff --git a/odk/CustomTarget_check.mk b/odk/CustomTarget_check.mk index ab6573e..e7d5244 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 ccbb93f..7dd0e20 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 4ff3501..0000000 --- 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 46ad959..0000000 --- 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 db0286b..899b42c 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++; diff --git a/scp2/source/sdkoo/sdkoo.scp b/scp2/source/sdkoo/sdkoo.scp index 1f4d9fc..9b17519 100644 --- a/scp2/source/sdkoo/sdkoo.scp +++ b/scp2/source/sdkoo/sdkoo.scp @@ -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; _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
