Skip to content
Projeler
Gruplar
Parçacıklar
Yardım
Yükleniyor...
Oturum aç / Kaydol
Gezinmeyi değiştir
C
core
Proje
Proje
Ayrıntılar
Etkinlik
Cycle Analytics
Depo (repository)
Depo (repository)
Dosyalar
Kayıtlar (commit)
Dallar (branch)
Etiketler
Katkıda bulunanlar
Grafik
Karşılaştır
Grafikler
Konular (issue)
0
Konular (issue)
0
Liste
Pano
Etiketler
Kilometre Taşları
Birleştirme (merge) Talepleri
0
Birleştirme (merge) Talepleri
0
CI / CD
CI / CD
İş akışları (pipeline)
İşler
Zamanlamalar
Grafikler
Paketler
Paketler
Wiki
Wiki
Parçacıklar
Parçacıklar
Üyeler
Üyeler
Collapse sidebar
Close sidebar
Etkinlik
Grafik
Grafikler
Yeni bir konu (issue) oluştur
İşler
Kayıtlar (commit)
Konu (issue) Panoları
Kenar çubuğunu aç
LibreOffice
core
Commits
c93a752a
Kaydet (Commit)
c93a752a
authored
Nis 24, 2013
tarafından
David Tardon
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
ritually kill odkcommon.zip
Change-Id: I0a814e3f5605340f00d4b48e83ce26792abec067
üst
99fb1839
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
22 additions
and
73 deletions
+22
-73
CustomTarget_check.mk
odk/CustomTarget_check.mk
+1
-2
CustomTarget_classes.mk
odk/CustomTarget_classes.mk
+1
-1
CustomTarget_doxygen.mk
odk/CustomTarget_doxygen.mk
+19
-11
CustomTarget_odkcommon.mk
odk/CustomTarget_odkcommon.mk
+0
-20
Module_odk.mk
odk/Module_odk.mk
+0
-7
Zip_cppdocs.mk
odk/Zip_cppdocs.mk
+1
-1
Zip_odkcommon.mk
odk/Zip_odkcommon.mk
+0
-23
module_sdkoo.scp
scp2/source/sdkoo/module_sdkoo.scp
+0
-1
sdkoo.scp
scp2/source/sdkoo/sdkoo.scp
+0
-7
No files found.
odk/CustomTarget_check.mk
Dosyayı görüntüle @
c93a752a
...
...
@@ -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) $< \
...
...
odk/CustomTarget_classes.mk
Dosyayı görüntüle @
c93a752a
...
...
@@ -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 $@
...
...
odk/CustomTarget_doxygen.mk
Dosyayı görüntüle @
c93a752a
...
...
@@ -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:
odk/CustomTarget_odkcommon.mk
deleted
100644 → 0
Dosyayı görüntüle @
99fb1839
# -*- 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:
odk/Module_odk.mk
Dosyayı görüntüle @
c93a752a
...
...
@@ -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 \
...
...
odk/Zip_cppdocs.mk
Dosyayı görüntüle @
c93a752a
...
...
@@ -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:
odk/Zip_odkcommon.mk
deleted
100644 → 0
Dosyayı görüntüle @
99fb1839
# -*- 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:
scp2/source/sdkoo/module_sdkoo.scp
Dosyayı görüntüle @
c93a752a
...
...
@@ -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
...
...
scp2/source/sdkoo/sdkoo.scp
Dosyayı görüntüle @
c93a752a
...
...
@@ -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;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment