odk/CustomTarget_check.mk | 4 ++--
odk/CustomTarget_classes.mk | 13 ++++++-------
odk/CustomTarget_doxygen.mk | 30 +++++++++++++++++++-----------
odk/CustomTarget_odkcommon.mk | 21 ---------------------
odk/Module_odk.mk | 7 -------
odk/Zip_cppdocs.mk | 2 +-
odk/Zip_odkcommon.mk | 23 -----------------------
scp2/source/sdkoo/module_sdkoo.scp | 4 ++--
scp2/source/sdkoo/sdkoo.scp | 16 +++++++++-------
9 files changed, 39 insertions(+), 81 deletions(-)
New commits:
commit c93a752ae77f5c03b61c29a2b05dd9580f181400
Author: David Tardon <dtar...@redhat.com>
Date: Wed Apr 24 15:20:51 2013 +0200
ritually kill odkcommon.zip
Change-Id: I0a814e3f5605340f00d4b48e83ce26792abec067
diff --git a/odk/CustomTarget_check.mk b/odk/CustomTarget_check.mk
index a5995fc..ab515c9 100644
--- a/odk/CustomTarget_check.mk
+++ b/odk/CustomTarget_check.mk
@@ -45,8 +45,7 @@ $(call gb_CustomTarget_get_workdir,odk/check)/checkbin : \
$(call gb_Package_get_target,odk_settings) \
$(call gb_Package_get_target,odk_settings_generated) \
$(if $(SOLAR_JAVA),$(call gb_Package_get_target,odk_unowinreg))
\
- $(call gb_PackageSet_get_target,odk_autodoc) \
- $(call gb_CustomTarget_get_target,odk/odkcommon)
+ $(call gb_PackageSet_get_target,odk_autodoc)
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CHK,1)
$(call gb_Helper_print_on_error,\
$(PERL) $< \
diff --git a/odk/CustomTarget_classes.mk b/odk/CustomTarget_classes.mk
index f813bcc..82f5247 100644
--- a/odk/CustomTarget_classes.mk
+++ b/odk/CustomTarget_classes.mk
@@ -22,7 +22,7 @@ $(eval $(call gb_JavaClassSet_add_sourcefiles,loader,\
odk/source/com/sun/star/lib/loader/WinRegKeyException \
))
-$(odk_WORKDIR)/classes/java.done: $(call gb_JavaClassSet_get_target,loader)
+$(call gb_CustomTarget_get_workdir,odk/odkcommon/classes)/java.done: $(call
gb_JavaClassSet_get_target,loader)
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,CPY,1)
cp -a $(call gb_JavaClassSet_get_classdir,loader)/com $(dir $@) && \
touch $@
diff --git a/odk/CustomTarget_doxygen.mk b/odk/CustomTarget_doxygen.mk
index e9a33ee..bddb0f3 100644
--- a/odk/CustomTarget_doxygen.mk
+++ b/odk/CustomTarget_doxygen.mk
@@ -7,7 +7,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_CustomTarget_CustomTarget,odk/odkcommon/docs/cpp/ref))
+$(eval $(call gb_CustomTarget_CustomTarget,odk/odkcommon/docs/cpp))
CPPDOCREFNAME := "$(PRODUCTNAME) $(PRODUCTVERSION) SDK C/C++ API Reference"
@@ -28,25 +28,33 @@ odk_INCFILELIST := com/sun/star/uno/Any.h \
DOXY_INPUT := $(SRCDIR)/odk/pack/gendocu/main.dox
$(SRCDIR)/include/sal/log-areas.dox \
$(addprefix
$(INSTDIR)/$(gb_Package_SDKDIRNAME)/include/,$(odk_INCDIRLIST)
$(odk_INCFILELIST))
DOXY_INPUT := $(if $(filter WNT,$(OS)),$(shell cygpath -u
$(DOXY_INPUT)),$(DOXY_INPUT))
-DOXY_WORKDIR := $(if $(filter WNT,$(OS)),$(shell cygpath -u
$(odk_WORKDIR)/docs/cpp/ref),$(odk_WORKDIR)/docs/cpp/ref)
+DOXY_WORKDIR := $(if $(filter WNT,$(OS)),\
+ $(shell cygpath -u $(call
gb_CustomTarget_get_workdir,odk/odkcommon/docs/cpp)/ref),\
+ $(call gb_CustomTarget_get_workdir,odk/odkcommon/docs/cpp)/ref)
DOXY_STRIP_PATH := $(if $(filter WNT,$(OS)),$(shell cygpath -u
$(OUTDIR)/inc),$(OUTDIR)/inc)
-DOXY_DEPS := $(SRCDIR)/odk/pack/gendocu/Doxyfile \
- $(SRCDIR)/odk/pack/gendocu/main.dox \
- $(SRCDIR)/include/sal/log-areas.dox \
- $(call gb_PackageSet_get_target,odk_headers)
-$(eval $(call
gb_CustomTarget_register_target,odk/odkcommon/docs/cpp/ref,index.html))
+$(eval $(call gb_CustomTarget_register_targets,odk/odkcommon/docs/cpp,\
+ Doxyfile \
+ doxygen.log \
+))
-$(odk_WORKDIR)/docs/cpp/ref/index.html: $(DOXY_DEPS)
- $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),GEN,1)
+$(call gb_CustomTarget_get_workdir,odk/odkcommon/docs/cpp)/Doxyfile :
$(SRCDIR)/odk/pack/gendocu/Doxyfile
+ $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),SED,1)
sed -e 's!^INPUT = %$$!INPUT = $(DOXY_INPUT)!' \
-e 's!^OUTPUT_DIRECTORY = %$$!OUTPUT_DIRECTORY =
$(DOXY_WORKDIR)!' \
-e 's!^PROJECT_BRIEF = %$$!PROJECT_BRIEF = $(CPPDOCREFNAME)!' \
-e 's!^PROJECT_NAME = %$$!PROJECT_NAME = $(PRODUCTNAME)!' \
-e 's!^QUIET = %$$!QUIET = $(if $(VERBOSE),NO,YES)!' \
-e 's!^STRIP_FROM_PATH = %$$!STRIP_FROM_PATH =
$(DOXY_STRIP_PATH)!' \
- $< > $(odk_WORKDIR)/Doxyfile && \
- $(DOXYGEN) $(odk_WORKDIR)/Doxyfile > $(odk_WORKDIR)/doxygen.log
+ $< > $@
+
+$(call gb_CustomTarget_get_workdir,odk/odkcommon/docs/cpp)/doxygen.log : \
+ $(call
gb_CustomTarget_get_workdir,odk/odkcommon/docs/cpp)/Doxyfile \
+ $(SRCDIR)/include/sal/log-areas.dox \
+ $(SRCDIR)/odk/pack/gendocu/main.dox \
+ $(call gb_PackageSet_get_target,odk_headers)
+ $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),GEN,1)
+ $(DOXYGEN) $< > $@
# vim: set noet sw=4 ts=4:
diff --git a/odk/CustomTarget_odkcommon.mk b/odk/CustomTarget_odkcommon.mk
deleted file mode 100644
index 627addf..0000000
--- a/odk/CustomTarget_odkcommon.mk
+++ /dev/null
@@ -1,20 +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/.
-#
-
-odk_WORKDIR := $(call gb_CustomTarget_get_workdir,odk/odkcommon)
-odkcommon_ZIPLIST :=
-odkcommon_ZIPDEPS :=
-
-$(eval $(call gb_CustomTarget_CustomTarget,odk/odkcommon))
-
-$(call gb_CustomTarget_get_target,odk/odkcommon): \
- $(call gb_CustomTarget_get_target,odk/odkcommon/idl) \
- $(call gb_CustomTarget_get_target,odk/odkcommon/include)
-
-# vim: set noet sw=4 ts=4:
diff --git a/odk/Module_odk.mk b/odk/Module_odk.mk
index 35865e8..94f8fc1 100644
--- a/odk/Module_odk.mk
+++ b/odk/Module_odk.mk
@@ -10,7 +10,6 @@
$(eval $(call gb_Module_Module,odk))
$(eval $(call gb_Module_add_targets,odk,\
- CustomTarget_odkcommon \
$(if $(filter WNT,$(OS)),Package_cli) \
$(if $(DOXYGEN),\
CustomTarget_doxygen \
@@ -64,12 +63,6 @@ $(eval $(call gb_Module_add_targets,odk,\
))
endif
-# This apparently needs to come last, as the various CustomTarget_* add to
-# odkcommon_ZIPLIST that is used here:
-$(eval $(call gb_Module_add_targets,odk,\
- Zip_odkcommon \
-))
-
$(eval $(call gb_Module_add_check_targets,odk,\
CppunitTest_checkapi \
CustomTarget_allheaders \
diff --git a/odk/Zip_cppdocs.mk b/odk/Zip_cppdocs.mk
index 1904cdb..1f86757 100644
--- a/odk/Zip_cppdocs.mk
+++ b/odk/Zip_cppdocs.mk
@@ -15,6 +15,6 @@ $(eval $(call gb_Zip_add_files,cppdocs,\
$(eval $(call gb_Zip_add_commandoptions,cppdocs,-r))
-$(call gb_Zip_get_target,cppdocs) : $(call
gb_CustomTarget_get_target,odk/odkcommon/docs/cpp/ref)
+$(call gb_Zip_get_target,cppdocs) : $(call
gb_CustomTarget_get_target,odk/odkcommon/docs/cpp)
# vim: set noet sw=4 ts=4:
diff --git a/odk/Zip_odkcommon.mk b/odk/Zip_odkcommon.mk
deleted file mode 100644
index 11827bd..0000000
--- a/odk/Zip_odkcommon.mk
+++ /dev/null
@@ -1,23 +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_Zip_Zip,odkcommon,$(call
gb_CustomTarget_get_workdir,odk/odkcommon)))
-
-$(eval $(call gb_Zip_add_files,odkcommon,\
- $(odkcommon_ZIPLIST) \
-))
-
-$(eval $(call gb_Zip_add_commandoptions,odkcommon,-r))
-
-# Additional dependencies for the zip. Because we are zipping whole
-# directories, we cannot just depend on make to figure out from file
-# dependencies which custom targets need to be built.
-$(call gb_Zip_get_target,odkcommon) : $(odkcommon_ZIPDEPS)
-
-# vim: set noet sw=4 ts=4:
diff --git a/scp2/source/sdkoo/module_sdkoo.scp
b/scp2/source/sdkoo/module_sdkoo.scp
index 72502e9..b59f8cd 100644
--- a/scp2/source/sdkoo/module_sdkoo.scp
+++ b/scp2/source/sdkoo/module_sdkoo.scp
@@ -50,7 +50,6 @@ Module gid_Module_Optional_Sdkoo
gid_File_Package_odk_unowinreg,
gid_File_Zip_cppdocs,
gid_File_Zip_Odkexamples,
- gid_File_Zip_Odkcommon,
gid_File_Zip_OdkIdl_udkapi,
gid_File_Zip_OdkIdl_offapi,
gid_File_Zip_uno_loader_classes
diff --git a/scp2/source/sdkoo/sdkoo.scp b/scp2/source/sdkoo/sdkoo.scp
index 72e74e5..a9388af 100644
--- a/scp2/source/sdkoo/sdkoo.scp
+++ b/scp2/source/sdkoo/sdkoo.scp
@@ -240,13 +240,6 @@ File gid_File_Zip_Odkexamples
Styles = (FILELIST,USE_INTERNAL_RIGHTS);
End
-File gid_File_Zip_Odkcommon
- TXT_FILE_BODY;
- Dir = gid_Dir_Basis_Sdk;
- Name = "odkcommon.zip";
- Styles = (ARCHIVE,USE_INTERNAL_RIGHTS);
-End
-
File gid_File_Zip_OdkIdl_udkapi
TXT_FILE_BODY;
Dir = FILELIST_SDK_DIR;
commit 99fb1839ef1679bc2904ade216f8c5ebb5c6989a
Author: David Tardon <dtar...@redhat.com>
Date: Tue Apr 23 19:53:09 2013 +0200
only put uno loader classes into one zip
These are put into uno_loader_classes.zip, which is then not used at
all, and odkcommon.zip, which is used for creation of install sets.
Seriously?!
Change-Id: I28b5bc73857cf524fb12f7918acd2891ff12d166
diff --git a/odk/CustomTarget_check.mk b/odk/CustomTarget_check.mk
index 3f06bd4..a5995fc 100644
--- a/odk/CustomTarget_check.mk
+++ b/odk/CustomTarget_check.mk
@@ -28,6 +28,7 @@ odk_PLATFORM := $(if $(filter WNT,$(OS)),\
$(call gb_CustomTarget_get_workdir,odk/check)/checkbin : \
$(SRCDIR)/odk/util/check.pl \
+ $(call gb_CustomTarget_get_target,odk/odkcommon/classes) \
$(if $(DOXYGEN),$(call
gb_CustomTarget_get_target,odk/odkcommon/docs/cpp/ref)) \
$(call gb_Package_get_target,odk_bin) \
$(if $(filter WNT,$(OS)),$(call gb_Package_get_target,odk_cli))
\
diff --git a/odk/CustomTarget_classes.mk b/odk/CustomTarget_classes.mk
index ad59a4a..f813bcc 100644
--- a/odk/CustomTarget_classes.mk
+++ b/odk/CustomTarget_classes.mk
@@ -9,6 +9,10 @@
$(eval $(call gb_CustomTarget_CustomTarget,odk/odkcommon/classes))
+$(eval $(call gb_CustomTarget_register_targets,odk/odkcommon/classes,\
+ java.done \
+))
+
$(eval $(call gb_JavaClassSet_JavaClassSet,loader))
$(eval $(call gb_JavaClassSet_add_sourcefiles,loader,\
@@ -18,14 +22,9 @@ $(eval $(call gb_JavaClassSet_add_sourcefiles,loader,\
odk/source/com/sun/star/lib/loader/WinRegKeyException \
))
-odkcommon_ZIPLIST += classes/com/sun/star/lib/loader
-odkcommon_ZIPDEPS += $(odk_WORKDIR)/classes/java.done
-
-$(call gb_CustomTarget_get_target,odk/odkcommon/classes):
$(odk_WORKDIR)/classes/java.done
$(odk_WORKDIR)/classes/java.done: $(call gb_JavaClassSet_get_target,loader)
- mkdir -p $(dir $@)
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,CPY,1)
- cp -a $(call gb_JavaClassSet_get_classdir,loader)/com $(dir $@)
+ cp -a $(call gb_JavaClassSet_get_classdir,loader)/com $(dir $@) && \
touch $@
# vim: set noet sw=4 ts=4:
diff --git a/odk/CustomTarget_odkcommon.mk b/odk/CustomTarget_odkcommon.mk
index c253c2e..627addf 100644
--- a/odk/CustomTarget_odkcommon.mk
+++ b/odk/CustomTarget_odkcommon.mk
@@ -14,7 +14,6 @@ odkcommon_ZIPDEPS :=
$(eval $(call gb_CustomTarget_CustomTarget,odk/odkcommon))
$(call gb_CustomTarget_get_target,odk/odkcommon): \
- $(call gb_CustomTarget_get_target,odk/odkcommon/classes) \
$(call gb_CustomTarget_get_target,odk/odkcommon/idl) \
$(call gb_CustomTarget_get_target,odk/odkcommon/include)
diff --git a/scp2/source/sdkoo/module_sdkoo.scp
b/scp2/source/sdkoo/module_sdkoo.scp
index 94fb3ea..72502e9 100644
--- a/scp2/source/sdkoo/module_sdkoo.scp
+++ b/scp2/source/sdkoo/module_sdkoo.scp
@@ -53,5 +53,6 @@ Module gid_Module_Optional_Sdkoo
gid_File_Zip_Odkcommon,
gid_File_Zip_OdkIdl_udkapi,
gid_File_Zip_OdkIdl_offapi,
- gid_File_Zip_Odkheaders);
+ gid_File_Zip_uno_loader_classes
+ );
End
diff --git a/scp2/source/sdkoo/sdkoo.scp b/scp2/source/sdkoo/sdkoo.scp
index 6d30f13..72e74e5 100644
--- a/scp2/source/sdkoo/sdkoo.scp
+++ b/scp2/source/sdkoo/sdkoo.scp
@@ -268,6 +268,15 @@ File gid_File_Zip_Odkheaders
Styles = (FILELIST,USE_INTERNAL_RIGHTS);
End
+#if defined(SOLAR_JAVA)
+File gid_File_Zip_uno_loader_classes
+ TXT_FILE_BODY;
+ Dir = gid_Dir_Basis_Sdk;
+ Name = "uno_loader_classes.zip";
+ Styles = (ARCHIVE,USE_INTERNAL_RIGHTS);
+End
+#endif
+
#if (!defined(WNT) && !defined( MACOSX) )
Directory gid_Dir_Lib_Sdk
Styles = (CREATE);
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
