Kaydet (Commit) 1ea1818d authored tarafından David Tardon's avatar David Tardon Kaydeden (comit) Fridrich Strba

use Package for unowinreg

Change-Id: I7546e8938ba41e1462e704bd0405c5a887151d7b
Reviewed-on: https://gerrit.libreoffice.org/3531Reviewed-by: 's avatarFridrich Strba <fridrich@documentfoundation.org>
Tested-by: 's avatarFridrich Strba <fridrich@documentfoundation.org>
üst 5c7f6ca7
...@@ -30,6 +30,7 @@ $(call gb_CustomTarget_get_workdir,odk/check)/checkbin : \ ...@@ -30,6 +30,7 @@ $(call gb_CustomTarget_get_workdir,odk/check)/checkbin : \
$(call gb_Package_get_target,odk_bin) \ $(call gb_Package_get_target,odk_bin) \
$(if $(filter WNT,$(OS)),$(call gb_Package_get_target,odk_cli)) \ $(if $(filter WNT,$(OS)),$(call gb_Package_get_target,odk_cli)) \
$(if $(filter MACOSX,$(OS)),$(call gb_Package_get_target,odk_macosx)) \ $(if $(filter MACOSX,$(OS)),$(call gb_Package_get_target,odk_macosx)) \
$(if $(SOLAR_JAVA),$(call gb_Package_get_target,odk_unowinreg)) \
$(call gb_CustomTarget_get_target,odk/odkcommon) $(call gb_CustomTarget_get_target,odk/odkcommon)
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CHK,1) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CHK,1)
touch $@ touch $@
......
...@@ -28,11 +28,4 @@ $(odk_WORKDIR)/classes/java.done: $(call gb_JavaClassSet_get_target,loader) ...@@ -28,11 +28,4 @@ $(odk_WORKDIR)/classes/java.done: $(call gb_JavaClassSet_get_target,loader)
cp -a $(call gb_JavaClassSet_get_classdir,loader)/com $(dir $@) cp -a $(call gb_JavaClassSet_get_classdir,loader)/com $(dir $@)
touch $@ touch $@
odkcommon_ZIPLIST += classes/win/unowinreg.dll
$(eval $(call gb_CustomTarget_register_target,odk/odkcommon/classes,win/unowinreg.dll))
$(odk_WORKDIR)/classes/win/unowinreg.dll: $(call gb_CustomTarget_get_workdir,odk/unowinreg)/unowinreg.dll
mkdir -p $(dir $@)
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,CPY,1)
cp $< $@
# vim: set noet sw=4 ts=4: # vim: set noet sw=4 ts=4:
...@@ -11,11 +11,6 @@ $(eval $(call gb_CustomTarget_CustomTarget,odk/unowinreg)) ...@@ -11,11 +11,6 @@ $(eval $(call gb_CustomTarget_CustomTarget,odk/unowinreg))
$(eval $(call gb_CustomTarget_register_target,odk/unowinreg,unowinreg.dll)) $(eval $(call gb_CustomTarget_register_target,odk/unowinreg,unowinreg.dll))
ifeq ($(BUILD_UNOWINREG),YES)
ifeq ($(COM),MSC)
$(call gb_CustomTarget_get_workdir,odk/unowinreg)/unowinreg.dll: $(call gb_Library_get_target,unowinreg)
cp $< $@
else # COM=GCC
$(call gb_CustomTarget_get_workdir,odk/unowinreg)/unowinreg.dll : \ $(call gb_CustomTarget_get_workdir,odk/unowinreg)/unowinreg.dll : \
$(SRCDIR)/odk/source/unowinreg/win/unowinreg.cxx $(SRCDIR)/odk/source/unowinreg/win/unowinreg.cxx
$(MINGWCXX) -Wall -D_JNI_IMPLEMENTATION_ \ $(MINGWCXX) -Wall -D_JNI_IMPLEMENTATION_ \
...@@ -25,12 +20,7 @@ $(call gb_CustomTarget_get_workdir,odk/unowinreg)/unowinreg.dll : \ ...@@ -25,12 +20,7 @@ $(call gb_CustomTarget_get_workdir,odk/unowinreg)/unowinreg.dll : \
-I$(JAVA_HOME)/include/bsd -I$(JAVA_HOME)/include/linux,\ -I$(JAVA_HOME)/include/bsd -I$(JAVA_HOME)/include/linux,\
$(if $(filter NETBSD,$(OS)),-I$(JAVA_HOME)/include/netbsd))) \ $(if $(filter NETBSD,$(OS)),-I$(JAVA_HOME)/include/netbsd))) \
-shared -o $@ $< \ -shared -o $@ $< \
-Wl,--kill-at -lkernel32 -ladvapi32 -Wl,--kill-at -lkernel32 -ladvapi32 && \
$(MINGWSTRIP) $@ $(MINGWSTRIP) $@
endif
else # BUILD_UNOWINREG=NO
$(call gb_CustomTarget_get_workdir,odk/unowinreg)/unowinreg.dll: $(TARFILE_LOCATION)/$(UNOWINREG_DLL)
cp $< $@
endif
# vim: set noet sw=4 ts=4: # vim: set noet sw=4 ts=4:
...@@ -30,10 +30,11 @@ endif ...@@ -30,10 +30,11 @@ endif
ifneq ($(SOLAR_JAVA),) ifneq ($(SOLAR_JAVA),)
$(eval $(call gb_Module_add_targets,odk,\ $(eval $(call gb_Module_add_targets,odk,\
CustomTarget_unowinreg \ $(if $(filter YESGCC,$(BUILD_UNOWINREG)$(COM)),CustomTarget_unowinreg) \
CustomTarget_classes \ CustomTarget_classes \
CustomTarget_javadoc \ CustomTarget_javadoc \
$(if $(filter WNT,$(OS)),Library_unowinreg) \ $(if $(filter WNT,$(OS)),Library_unowinreg) \
Package_unowinreg \
Zip_uno_loader_classes \ Zip_uno_loader_classes \
)) ))
endif endif
......
# -*- 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/.
#
ifeq ($(BUILD_UNOWINREG),YES)
ifeq ($(COM),MSC)
odk_unowinreg_DIR := $(OUTDIR)/bin
else
odk_unowinreg_DIR := $(call gb_CustomTarget_get_workdir,odk/unowinreg)
endif
odk_unowinreg_FILE := unowinreg.dll
else # BUILD_UNOWINREG=NO
odk_unowinreg_DIR := $(TARFILE_LOCATION)
odk_unowinreg_FILE := $(UNOWINREG_DLL)
endif
$(eval $(call gb_Package_Package,odk_unowinreg,$(odk_unowinreg_DIR)))
$(eval $(call gb_Package_set_outdir,odk_unowinreg,$(INSTDIR)))
$(eval $(call gb_Package_add_file,odk_unowinreg,$(gb_Package_SDKDIRNAME)/classes/win/unowinreg.dll,$(odk_unowinreg_FILE)))
# vim: set noet sw=4 ts=4:
...@@ -13,7 +13,6 @@ $(eval $(call gb_Zip_add_commandoptions,uno_loader_classes,-r)) ...@@ -13,7 +13,6 @@ $(eval $(call gb_Zip_add_commandoptions,uno_loader_classes,-r))
$(eval $(call gb_Zip_add_files,uno_loader_classes,\ $(eval $(call gb_Zip_add_files,uno_loader_classes,\
com/sun/star/lib/loader \ com/sun/star/lib/loader \
win/unowinreg.dll \
)) ))
$(call gb_Zip_get_target,uno_loader_classes) : $(call gb_CustomTarget_get_target,odk/odkcommon/classes) $(call gb_Zip_get_target,uno_loader_classes) : $(call gb_CustomTarget_get_target,odk/odkcommon/classes)
......
...@@ -37,6 +37,7 @@ Module gid_Module_Optional_Sdkoo ...@@ -37,6 +37,7 @@ Module gid_Module_Optional_Sdkoo
gid_File_Package_odk_bin, gid_File_Package_odk_bin,
gid_File_Package_odk_cli, gid_File_Package_odk_cli,
gid_File_Package_odk_macosx, gid_File_Package_odk_macosx,
gid_File_Package_odk_unowinreg,
gid_File_Zip_Odkexamples, gid_File_Zip_Odkexamples,
gid_File_Zip_Odkcommon, gid_File_Zip_Odkcommon,
gid_File_Zip_OdkIdl_udkapi, gid_File_Zip_OdkIdl_udkapi,
......
...@@ -141,6 +141,15 @@ File gid_File_Package_odk_macosx ...@@ -141,6 +141,15 @@ File gid_File_Package_odk_macosx
End End
#endif #endif
#if defined(SOLAR_JAVA)
File gid_File_Package_odk_unowinreg
TXT_FILE_BODY;
Dir = FILELIST_SDK_DIR;
Name = "odk_unowinreg.filelist";
Styles = (FILELIST,USE_INTERNAL_RIGHTS);
End
#endif
File gid_File_Zip_Odkexamples File gid_File_Zip_Odkexamples
TXT_FILE_BODY; TXT_FILE_BODY;
Dir = FILELIST_SDK_DIR; 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