diff options
Diffstat (limited to 'setup_native')
80 files changed, 719 insertions, 1219 deletions
diff --git a/setup_native/CustomTarget_mac.mk b/setup_native/CustomTarget_mac.mk new file mode 100644 index 000000000000..2746dfc507d9 --- /dev/null +++ b/setup_native/CustomTarget_mac.mk @@ -0,0 +1,29 @@ +# -*- 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_CustomTarget_CustomTarget,setup_native/mac)) + +$(eval $(call gb_CustomTarget_register_target,setup_native/mac,macinstall.ulf)) + +#FIXME: generalize rule? ripped off from ScpMergeTarget +ifneq ($(WITH_LANG),) +$(call gb_CustomTarget_get_workdir,setup_native/mac)/macinstall.ulf: mac_POFILES := $(foreach lang,$(gb_TRANS_LANGS),$(gb_POLOCATION)/$(lang)/$(patsubst %/,%,$(dir $@)).po) +$(call gb_CustomTarget_get_workdir,setup_native/mac)/macinstall.ulf: $(SRCDIR)/setup_native/source/mac/macinstall.ulf | $(call gb_Executable_get_runtime_dependencies,ulfex) + $(call gb_Output_announce,$@,$(true),SUM,1) + MERGEINPUT=`$(gb_MKTEMP)` && \ + echo $(mac_POFILES) > $${MERGEINPUT} && \ + $(call gb_Helper_abbreviate_dirs,\ + $(call gb_Executable_get_command,ulfconv) -p setup_native -i $< -o $@ -m $${MERGEINPUT} -l all ) && \ + rm -rf $${MERGEINPUT} +else +$(call gb_CustomTarget_get_workdir,setup_native/mac)/macinstall.ulf: $(SRCDIR)/setup_native/source/mac/macinstall.ulf + cp $< $@ +endif + +# vim: set noet sw=4 ts=4: diff --git a/setup_native/CustomTarget_scripts.mk b/setup_native/CustomTarget_scripts.mk new file mode 100644 index 000000000000..f6494fa5887d --- /dev/null +++ b/setup_native/CustomTarget_scripts.mk @@ -0,0 +1,57 @@ +# -*- 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/. +# + +scripts_WORKDIR :=$(call gb_CustomTarget_get_workdir,setup_native/scripts) + +$(eval $(call gb_CustomTarget_CustomTarget,setup_native/scripts)) + +ifeq ($(OS),LINUX) +ifneq ($(filter rpm,$(PKGFORMAT)),) +$(eval $(call gb_CustomTarget_register_targets,setup_native/scripts,\ + install \ + uninstall \ + fake-db-1.0-0.noarch.rpm \ +)) + +$(scripts_WORKDIR)/fake-db-1.0-0.noarch.rpm: $(SRCDIR)/setup_native/scripts/fake-db.spec + mkdir -p $(scripts_WORKDIR)/fake-db-root + $(RPM) --define "_builddir $(scripts_WORKDIR)/fake-db-root" \ + --define "_rpmdir $(scripts_WORKDIR)" -bb $@ + chmod g+w $(scripts_WORKDIR)/fake-db-root + +$(scripts_WORKDIR)/install: $(SRCDIR)/setup_native/scripts/install_linux.sh $(scripts_WORKDIR)/fake-db-1.0-0.noarch.rpm + $(SRCDIR)/setup_native/scripts/install_create.pl $< $@ + chmod 775 $@ + +$(scripts_WORKDIR)/uninstall: $(SRCDIR)/setup_native/scripts/uninstall_linux.sh + cat $< | tr -d "\015" > $@ + chmod 775 $@ +endif +endif + +ifeq ($(OS),SOLARIS) +$(eval $(call gb_CustomTarget_register_targets,setup_native/scripts,\ + install \ + uninstall \ + getuid.so.stripped \ +)) + +$(scripts_WORKDIR)/getuid.so.stripped: $(call gb_Library_get_target,getuid) + cp $< $@ + /usr/ccs/bin/strip $@ +$(scripts_WORKDIR)/install: $(SRCDIR)/setup_native/scripts/install_solaris.sh $(scripts_WORKDIR)/getuid.so.stripped + $(SRCDIR)/setup_native/scripts/install_create.pl $< $@ + chmod 775 $@ + +$(scripts_WORKDIR)/uninstall: $(SRCDIR)/setup_native/scripts/uninstall_solaris.sh $(scripts_WORKDIR)/getuid.so.stripped + $(SRCDIR)/setup_native/scripts/install_create.pl $< $@ + chmod 775 $@ +endif + +# vim: set noet sw=4 ts=4: diff --git a/setup_native/CustomTarget_spell.mk b/setup_native/CustomTarget_spell.mk new file mode 100644 index 000000000000..b18095658421 --- /dev/null +++ b/setup_native/CustomTarget_spell.mk @@ -0,0 +1,17 @@ +# -*- 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_CustomTarget_CustomTarget,setup_native/spell)) + +$(eval $(call gb_CustomTarget_register_target,setup_native/spell,spellchecker_selection.hxx)) + +$(call gb_CustomTarget_get_workdir,setup_native/spell)/spellchecker_selection.hxx: $(SRCDIR)/setup_native/source/packinfo/spellchecker_selection.txt $(SRCDIR)/setup_native/source/packinfo/spellchecker_selection.pl + $(PERL) -w $(SRCDIR)/setup_native/source/packinfo/spellchecker_selection.pl <$< >$@ + +# vim: set noet sw=4 ts=4: diff --git a/setup_native/CustomTarget_wintools.mk b/setup_native/CustomTarget_wintools.mk new file mode 100644 index 000000000000..15017d5e3dda --- /dev/null +++ b/setup_native/CustomTarget_wintools.mk @@ -0,0 +1,38 @@ +# -*- 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/. +# + +wintools_WORKDIR := $(call gb_CustomTarget_get_workdir,setup_native/wintools) +wintools_SRCDIR := $(SRCDIR)/setup_native/source/win32/wintools + +$(eval $(call gb_CustomTarget_CustomTarget,setup_native/wintools)) + +$(eval $(call gb_CustomTarget_register_targets,setup_native/wintools,\ + makecab.exe \ + msidb.exe \ + msiinfo.exe \ + msimsp.exe \ + msitran.exe \ +)) + +$(wintools_WORKDIR)/makecab.exe: $(wintools_SRCDIR)/makecab.c $(wintools_SRCDIR)/parseddf.c + $(WINEGCC) -o $@ $< -m32 -mconsole -lmsi + +$(wintools_WORKDIR)/msidb.exe: $(wintools_SRCDIR)/msidb.c + $(WINEGCC) -o $@ $< -m32 -municode -lmsi + +$(wintools_WORKDIR)/msiinfo.exe: $(wintools_SRCDIR)/msiinfo.c + $(WINEGCC) -o $@ $< -m32 -mconsole -municode -lmsi + +$(wintools_WORKDIR)/msimsp.exe: $(wintools_SRCDIR)/msimsp.c + $(WINEGCC) -o $@ $< -m32 -mconsole -lmsi + +$(wintools_WORKDIR)/msitran.exe: $(wintools_SRCDIR)/msitran.c + $(WINEGCC) -o $@ $< -m32 -mconsole -lmsi + +# vim: set noet sw=4 ts=4: diff --git a/setup_native/Library_getuid.mk b/setup_native/Library_getuid.mk new file mode 100644 index 000000000000..764128dcb96a --- /dev/null +++ b/setup_native/Library_getuid.mk @@ -0,0 +1,25 @@ +# -*- 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_Library_Library,getuid)) + +ifeq ($(OS),LINUX) +$(eval $(call gb_Library_add_defs,getuid,\ + -D_GNU_SOURCE \ +)) +endif +$(eval $(call gb_Library_add_cobjects,getuid,\ + setup_native/scripts/source/getuid \ +)) + +$(eval $(call gb_Library_add_libs,getuid,\ + -ldl \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/setup_native/Library_instooofiltmsi.mk b/setup_native/Library_instooofiltmsi.mk new file mode 100644 index 000000000000..c37f9ffaf919 --- /dev/null +++ b/setup_native/Library_instooofiltmsi.mk @@ -0,0 +1,16 @@ +# -*- 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_Library_Library,instooofiltmsi)) + +$(eval $(call gb_Library_add_exception_objects,instooofiltmsi,\ + setup_native/source/win32/customactions/indexingfilter/restartindexingservice \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/setup_native/Library_jfregca.mk b/setup_native/Library_jfregca.mk new file mode 100644 index 000000000000..9dcb3c55d4f2 --- /dev/null +++ b/setup_native/Library_jfregca.mk @@ -0,0 +1,21 @@ +# -*- 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_Library_Library,jfregca)) + +$(eval $(call gb_Library_add_exception_objects,jfregca,\ + setup_native/source/win32/customactions/javafilter/jfregca \ +)) + +$(eval $(call gb_Library_use_system_win32_libs,jfregca,\ + msi \ + advapi32 \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/setup_native/Library_qslnkmsi.mk b/setup_native/Library_qslnkmsi.mk new file mode 100644 index 000000000000..602c0460eddf --- /dev/null +++ b/setup_native/Library_qslnkmsi.mk @@ -0,0 +1,26 @@ +# -*- 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_Library_Library,qslnkmsi)) + +$(eval $(call gb_Library_add_exception_objects,qslnkmsi,\ + setup_native/source/win32/customactions/quickstarter/remove_quickstart_link \ +)) + +$(eval $(call gb_Library_use_static_libraries,qslnkmsi,\ + quickstarter \ +)) + +$(eval $(call gb_Library_use_system_win32_libs,qslnkmsi,\ + msi \ + advapi32 \ + shell32 \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/setup_native/Library_reg4allmsdoc.mk b/setup_native/Library_reg4allmsdoc.mk new file mode 100644 index 000000000000..819fb7bd3f47 --- /dev/null +++ b/setup_native/Library_reg4allmsdoc.mk @@ -0,0 +1,30 @@ +# -*- 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_Library_Library,reg4allmsdoc)) + +$(eval $(call gb_Library_add_defs,reg4allmsdoc,\ + -DUNICODE \ + -D_UNICODE \ +)) + +$(eval $(call gb_Library_add_exception_objects,reg4allmsdoc,\ + setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi \ +)) + +$(eval $(call gb_Library_use_system_win32_libs,reg4allmsdoc,\ + msi \ + kernel32 \ + user32 \ + advapi32 \ + shell32 \ + shlwapi \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/setup_native/Library_regactivex.mk b/setup_native/Library_regactivex.mk new file mode 100644 index 000000000000..fdb5404929fe --- /dev/null +++ b/setup_native/Library_regactivex.mk @@ -0,0 +1,20 @@ +# -*- 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_Library_Library,regactivex)) + +$(eval $(call gb_Library_add_exception_objects,regactivex,\ + setup_native/source/win32/customactions/regactivex/regactivex \ +)) + +$(eval $(call gb_Library_use_system_win32_libs,regactivex,\ + msi \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/setup_native/source/packinfo/makefile.mk b/setup_native/Library_regpatchactivex.mk index a2c647886cf2..4926fd9773c6 100644 --- a/setup_native/source/packinfo/makefile.mk +++ b/setup_native/Library_regpatchactivex.mk @@ -7,18 +7,18 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -PRJ = ../.. -PRJNAME = setup_native -TARGET = packinfo +$(eval $(call gb_Library_Library,regpatchactivex)) -.INCLUDE: settings.mk +$(eval $(call gb_Library_add_exception_objects,regpatchactivex,\ + setup_native/source/win32/customactions/regpatchactivex/regpatchactivex \ +)) -ALLTAR: $(OUT)/inc/spellchecker_selection.hxx - -.INCLUDE: target.mk - -$(OUT)/inc/spellchecker_selection.hxx .ERRREMOVE : spellchecker_selection.pl \ - spellchecker_selection.txt - $(PERL) -w spellchecker_selection.pl <spellchecker_selection.txt >$@ +$(eval $(call gb_Library_use_system_win32_libs,regpatchactivex,\ + msi \ + kernel32 \ + user32 \ + advapi32 \ + shell32 \ +)) # vim: set noet sw=4 ts=4: diff --git a/setup_native/Library_sdqsmsi.mk b/setup_native/Library_sdqsmsi.mk new file mode 100644 index 000000000000..d01cf93c1c30 --- /dev/null +++ b/setup_native/Library_sdqsmsi.mk @@ -0,0 +1,26 @@ +# -*- 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_Library_Library,sdqsmsi)) + +$(eval $(call gb_Library_add_exception_objects,sdqsmsi,\ + setup_native/source/win32/customactions/quickstarter/shutdown_quickstart \ +)) + +$(eval $(call gb_Library_use_static_libraries,sdqsmsi,\ + quickstarter \ +)) + +$(eval $(call gb_Library_use_system_win32_libs,sdqsmsi,\ + msi \ + advapi32 \ + shell32 \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/setup_native/Library_sellangmsi.mk b/setup_native/Library_sellangmsi.mk new file mode 100644 index 000000000000..e32e7f67126c --- /dev/null +++ b/setup_native/Library_sellangmsi.mk @@ -0,0 +1,29 @@ +# -*- 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_Library_Library,sellangmsi)) + +$(eval $(call gb_Library_add_defs,sellangmsi,\ + -D_STLP_USE_STATIC_LIB \ +)) + +$(eval $(call gb_Library_add_exception_objects,sellangmsi,\ + setup_native/source/win32/customactions/sellang/sellang \ + setup_native/source/win32/customactions/sellang/sorttree \ +)) + +$(eval $(call gb_Library_use_system_win32_libs,sellangmsi,\ + msi \ + kernel32 \ + user32 \ + advapi32 \ + shell32 \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/setup_native/Library_shlxtmsi.mk b/setup_native/Library_shlxtmsi.mk new file mode 100644 index 000000000000..dfc8f348c2f0 --- /dev/null +++ b/setup_native/Library_shlxtmsi.mk @@ -0,0 +1,37 @@ +# -*- 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_Library_Library,shlxtmsi)) + +$(eval $(call gb_Library_use_external,shlxtmsi,boost_headers)) + +$(eval $(call gb_Library_add_exception_objects,shlxtmsi,\ + setup_native/source/win32/customactions/shellextensions/startmenuicon \ + setup_native/source/win32/customactions/shellextensions/upgrade \ + setup_native/source/win32/customactions/shellextensions/iconcache \ + setup_native/source/win32/customactions/shellextensions/migrateinstallpath \ + setup_native/source/win32/customactions/shellextensions/completeinstallpath \ + setup_native/source/win32/customactions/shellextensions/checkdirectory \ + setup_native/source/win32/customactions/shellextensions/layerlinks \ + setup_native/source/win32/customactions/shellextensions/vistaspecial \ + setup_native/source/win32/customactions/shellextensions/checkpatches \ +)) + +$(eval $(call gb_Library_use_static_libraries,shlxtmsi,\ + seterror \ +)) + +$(eval $(call gb_Library_use_system_win32_libs,shlxtmsi,\ + msi \ + advapi32 \ + shell32 \ + psapi \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/setup_native/Library_sn_tools.mk b/setup_native/Library_sn_tools.mk new file mode 100644 index 000000000000..d0d273f5d1a7 --- /dev/null +++ b/setup_native/Library_sn_tools.mk @@ -0,0 +1,25 @@ +# -*- 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_Library_Library,sn_tools)) + +$(eval $(call gb_Library_add_exception_objects,sn_tools,\ + setup_native/source/win32/customactions/tools/checkversion \ +)) + +$(eval $(call gb_Library_use_static_libraries,sn_tools,\ + seterror \ +)) + +$(eval $(call gb_Library_use_system_win32_libs,sn_tools,\ + msi \ + advapi32 \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/setup_native/Library_thidxmsi.mk b/setup_native/Library_thidxmsi.mk new file mode 100644 index 000000000000..1647bb32727c --- /dev/null +++ b/setup_native/Library_thidxmsi.mk @@ -0,0 +1,28 @@ +# -*- 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_Library_Library,thidxmsi)) + +$(eval $(call gb_Library_add_defs,thidxmsi,\ + -D_STLP_USE_STATIC_LIB \ +)) + +$(eval $(call gb_Library_add_exception_objects,thidxmsi,\ + setup_native/source/win32/customactions/thesaurus/thesaurus \ +)) + +$(eval $(call gb_Library_use_system_win32_libs,thidxmsi,\ + msi \ + kernel32 \ + user32 \ + advapi32 \ + shell32 \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/setup_native/Makefile b/setup_native/Makefile new file mode 100644 index 000000000000..ccb1c85a04da --- /dev/null +++ b/setup_native/Makefile @@ -0,0 +1,7 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- + +module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST)))) + +include $(module_directory)/../solenv/gbuild/partial_build.mk + +# vim: set noet sw=4 ts=4: diff --git a/setup_native/Module_setup_native.mk b/setup_native/Module_setup_native.mk new file mode 100644 index 000000000000..26cd9240b00f --- /dev/null +++ b/setup_native/Module_setup_native.mk @@ -0,0 +1,59 @@ +# -*- 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_Module_Module,setup_native)) + +$(eval $(call gb_Module_add_targets,setup_native,\ + $(if $(filter LINUX SOLARIS,$(OS)),Library_getuid) \ + CustomTarget_spell \ + Package_packinfo \ + Package_spell \ + Package_misc \ +)) + +ifeq ($(OS),MACOSX) +$(eval $(call gb_Module_add_targets,setup_native,\ + CustomTarget_mac \ +)) +endif + +ifeq ($(OS),WNT) + +ifeq ($(COM),MSC) +$(eval $(call gb_Module_add_targets,setup_native,\ + Library_instooofiltmsi \ + Library_jfregca \ + Library_qslnkmsi \ + Library_reg4allmsdoc \ + Library_regactivex \ + Library_regpatchactivex \ + Library_sdqsmsi \ + Library_sellangmsi \ + Library_shlxtmsi \ + Library_sn_tools \ + Library_thidxmsi \ + StaticLibrary_quickstarter \ + StaticLibrary_seterror \ +)) +else +$(eval $(call gb_Module_add_targets,setup_native,\ + CustomTarget_wintools \ + Package_wintools \ +)) +endif + +else +$(eval $(call gb_Module_add_targets,setup_native,\ + CustomTarget_scripts \ + Package_scripts \ + Package_scripts_generated \ +)) +endif + +# vim: set noet sw=4 ts=4: diff --git a/setup_native/Package_misc.mk b/setup_native/Package_misc.mk new file mode 100644 index 000000000000..90e37db8db85 --- /dev/null +++ b/setup_native/Package_misc.mk @@ -0,0 +1,25 @@ +# -*- 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,setup_native/misc,$(SRCDIR)/setup_native/source)) + +$(eval $(call gb_Package_add_file,setup_native/misc,bin/Info.plist.langpack,mac/Info.plist.langpack)) +$(eval $(call gb_Package_add_file,setup_native/misc,bin/ooo3_installer.icns,mac/ooo3_installer.icns)) +$(eval $(call gb_Package_add_file,setup_native/misc,bin/osl/DS_Store,mac/ooo/DS_Store)) +$(eval $(call gb_Package_add_file,setup_native/misc,bin/osl/DS_Store_Dev,mac/ooo/DS_Store_Dev)) +$(eval $(call gb_Package_add_file,setup_native/misc,bin/osl/DS_Store_Langpack,mac/ooo/DS_Store_Langpack)) +$(eval $(call gb_Package_add_file,setup_native/misc,bin/osl/osxdndinstall.png,mac/ooo/osxdndinstall.png)) +$(eval $(call gb_Package_add_file,setup_native/misc,bin/root3.dat,linux/root3.dat)) +$(eval $(call gb_Package_add_file,setup_native/misc,bin/root4.dat,linux/root4.dat)) +$(eval $(call gb_Package_add_file,setup_native/misc,bin/root5.dat,linux/root5.dat)) +$(eval $(call gb_Package_add_file,setup_native/misc,bin/patchlist.txt,win32/patchlist.txt)) +$(eval $(call gb_Package_add_file,setup_native/misc,bin/desktophelper.txt,win32/desktophelper.txt)) +$(eval $(call gb_Package_add_file,setup_native/misc,bin/get_retval.bat,win32/get_retval.bat)) + +# vim: set noet sw=4 ts=4: diff --git a/setup_native/Package_packinfo.mk b/setup_native/Package_packinfo.mk new file mode 100644 index 000000000000..945d3dc2e87e --- /dev/null +++ b/setup_native/Package_packinfo.mk @@ -0,0 +1,36 @@ +# -*- 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,setup_native/packinfo,$(SRCDIR)/setup_native/source/packinfo)) + +$(eval $(call gb_Package_add_file,setup_native/packinfo,bin/solariscopyrightfile,solariscopyrightfile)) +$(eval $(call gb_Package_add_file,setup_native/packinfo,bin/linuxcopyrightfile,linuxcopyrightfile)) +$(eval $(call gb_Package_add_file,setup_native/packinfo,bin/libreoffice.pcp,libreoffice.pcp)) +$(eval $(call gb_Package_add_file,setup_native/packinfo,bin/openofficelanguagepack.pcp,openofficelanguagepack.pcp)) +$(eval $(call gb_Package_add_file,setup_native/packinfo,bin/ure.pcp,ure.pcp)) +$(eval $(call gb_Package_add_file,setup_native/packinfo,bin/finals_instsetoo.txt,finals_instsetoo.txt)) +$(eval $(call gb_Package_add_file,setup_native/packinfo,bin/package.txt,package.txt)) +$(eval $(call gb_Package_add_file,setup_native/packinfo,bin/package_names.txt,package_names.txt)) +$(eval $(call gb_Package_add_file,setup_native/packinfo,bin/package_names_ext.txt,package_names_ext.txt)) +$(eval $(call gb_Package_add_file,setup_native/packinfo,bin/packinfo_accessories.txt,packinfo_accessories.txt)) +$(eval $(call gb_Package_add_file,setup_native/packinfo,bin/packinfo_brand.txt,packinfo_brand.txt)) +$(eval $(call gb_Package_add_file,setup_native/packinfo,bin/packinfo_extensions.txt,packinfo_extensions.txt)) +$(eval $(call gb_Package_add_file,setup_native/packinfo,bin/packinfo_office.txt,packinfo_office.txt)) +$(eval $(call gb_Package_add_file,setup_native/packinfo,bin/packinfo_office_help.txt,packinfo_office_help.txt)) +$(eval $(call gb_Package_add_file,setup_native/packinfo,bin/packinfo_office_lang.txt,packinfo_office_lang.txt)) +$(eval $(call gb_Package_add_file,setup_native/packinfo,bin/packinfo_sdkoo.txt,packinfo_sdkoo.txt)) +$(eval $(call gb_Package_add_file,setup_native/packinfo,bin/packinfo_test.txt,packinfo_test.txt)) +$(eval $(call gb_Package_add_file,setup_native/packinfo,bin/packinfo_ure.txt,packinfo_ure.txt)) +$(eval $(call gb_Package_add_file,setup_native/packinfo,bin/shellscripts.txt,shellscripts.txt)) +$(eval $(call gb_Package_add_file,setup_native/packinfo,bin/shellscripts_core01.txt,shellscripts_core01.txt)) +$(eval $(call gb_Package_add_file,setup_native/packinfo,bin/shellscripts_module.txt,shellscripts_module.txt)) +$(eval $(call gb_Package_add_file,setup_native/packinfo,bin/shellscripts_root.txt,shellscripts_root.txt)) +$(eval $(call gb_Package_add_file,setup_native/packinfo,bin/spellchecker_selection.txt,spellchecker_selection.txt)) + +# vim: set noet sw=4 ts=4: diff --git a/setup_native/Package_scripts.mk b/setup_native/Package_scripts.mk new file mode 100644 index 000000000000..82156a57f3c4 --- /dev/null +++ b/setup_native/Package_scripts.mk @@ -0,0 +1,24 @@ +# -*- 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,setup_native/scripts,$(SRCDIR)/setup_native/scripts)) + +$(eval $(call gb_Package_add_file,setup_native/scripts,bin/admin.pl,admin.pl)) +$(eval $(call gb_Package_add_file,setup_native/scripts,bin/mac_install.script,mac_install.script)) +$(eval $(call gb_Package_add_file,setup_native/scripts,bin/osx_install_languagepack.applescript,osx_install_languagepack.applescript)) +$(eval $(call gb_Package_add_file,setup_native/scripts,bin/langpackscript.sh,langpackscript.sh)) +$(eval $(call gb_Package_add_file,setup_native/scripts,bin/javaloader.sh,javaloader.sh)) +$(eval $(call gb_Package_add_file,setup_native/scripts,bin/update,update.sh)) +$(eval $(call gb_Package_add_file,setup_native/scripts,bin/downloadscript.sh,downloadscript.sh)) + +ifeq ($(ENABLE_ONLINUE_UPDATE),TRUE) +$(eval $(call gb_Package_add_file,setup_native/scripts,bin/unpack_update,unpack_update.sh)) +endif + +# vim: set noet sw=4 ts=4: diff --git a/setup_native/Package_scripts_generated.mk b/setup_native/Package_scripts_generated.mk new file mode 100644 index 000000000000..df350e4076d4 --- /dev/null +++ b/setup_native/Package_scripts_generated.mk @@ -0,0 +1,24 @@ +# -*- 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,scripts_generated,$(call gb_CustomTarget_get_workdir,setup_native/scripts))) + +ifeq ($(OS),SOLARIS) +$(eval $(call gb_Package_add_file,scripts,bin/userscripts/install,install)) +$(eval $(call gb_Package_add_file,scripts,bin/userscripts/uninstall,uninstall)) +endif + +ifeq ($(OS),LINUX) +ifneq ($(filter-out rpm,$(PKGFORMAT)),) +$(eval $(call gb_Package_add_file,scripts,bin/userscripts/install,install)) +$(eval $(call gb_Package_add_file,scripts,bin/userscripts/uninstall,uninstall)) +$(eval $(call gb_Package_add_file,scripts,bin/openoffice-userland-1.0-0.noarch.rpm,fake-db-1.0-0.noarch.rpm)) +endif +endif +# vim: set noet sw=4 ts=4: diff --git a/setup_native/Package_spell.mk b/setup_native/Package_spell.mk new file mode 100644 index 000000000000..a951a2d0ce7e --- /dev/null +++ b/setup_native/Package_spell.mk @@ -0,0 +1,14 @@ +# -*- 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,spell,$(call gb_CustomTarget_get_workdir,setup_native/spell))) + +$(eval $(call gb_Package_add_file,spell,inc/spellchecker_selection.hxx,spellchecker_selection.hxx)) + +# vim: set noet sw=4 ts=4: diff --git a/setup_native/Package_ulf.mk b/setup_native/Package_ulf.mk new file mode 100644 index 000000000000..14f7b720867f --- /dev/null +++ b/setup_native/Package_ulf.mk @@ -0,0 +1,14 @@ +# -*- 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,setup_native/ulf,$(SRCDIR)/setup_native/source/mac)) + +$(eval $(call gb_Package_add_file,setup_native/misc,bin/macinstall.ulf,mac/macinstall.ulf)) + +# vim: set noet sw=4 ts=4: diff --git a/setup_native/Package_wintools.mk b/setup_native/Package_wintools.mk new file mode 100644 index 000000000000..422b9cf3bf2d --- /dev/null +++ b/setup_native/Package_wintools.mk @@ -0,0 +1,20 @@ +# -*- 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,wintools,$(call gb_CustomTarget_get_workdir,setup_native/wintools))) + +$(eval $(call gb_Package_add_files,scripts,bin,\ + mackcab.exe \ + msidb.exe \ + msiinfo.exe \ + msimsp.exe \ + msitran.exe\ +)) + +# vim: set noet sw=4 ts=4: diff --git a/setup_native/StaticLibrary_quickstarter.mk b/setup_native/StaticLibrary_quickstarter.mk new file mode 100644 index 000000000000..1cd916c2d2f7 --- /dev/null +++ b/setup_native/StaticLibrary_quickstarter.mk @@ -0,0 +1,16 @@ +# -*- 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_StaticLibrary_StaticLibrary,quickstarter)) + +$(eval $(call gb_StaticLibrary_add_exception_objects,quickstarter,\ + setup_native/source/win32/customactions/quickstarter/quickstarter \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/setup_native/StaticLibrary_seterror.mk b/setup_native/StaticLibrary_seterror.mk new file mode 100644 index 000000000000..9ba8c3cb0ff5 --- /dev/null +++ b/setup_native/StaticLibrary_seterror.mk @@ -0,0 +1,16 @@ +# -*- 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_StaticLibrary_StaticLibrary,seterror)) + +$(eval $(call gb_StaticLibrary_add_exception_objects,seterror,\ + setup_native/source/win32/customactions/tools/seterror \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/setup_native/prj/build.lst b/setup_native/prj/build.lst index 20ad1e58c0ee..be44d4eb477e 100644 --- a/setup_native/prj/build.lst +++ b/setup_native/prj/build.lst @@ -1,21 +1,2 @@ pk setup_native : DESKTOP:l10ntools soltools sal NULL -pk setup_native usr1 - all sn_mkout NULL -pk setup_native\scripts\source nmake - u sn_source NULL -pk setup_native\scripts nmake - u sn_scripts sn_source.u NULL -pk setup_native\source\mac nmake - u sn_mac NULL -pk setup_native\source\packinfo nmake - w sn_packinfo NULL -pk setup_native\source\win32\customactions\tools nmake - w sn_tools NULL -pk setup_native\source\win32\customactions\regactivex nmake - w sn_regactivex NULL -pk setup_native\source\win32\customactions\regpatchactivex nmake - w sn_regpatchactivex NULL -pk setup_native\source\win32\customactions\reg4allmsdoc nmake - w sn_reg4allmsdoc NULL -pk setup_native\source\win32\customactions\sellang nmake - w sn_sellang sn_packinfo.w NULL -pk setup_native\source\win32\customactions\thesaurus nmake - w sn_thesaurus NULL -pk setup_native\source\win32\customactions\javafilter nmake - w sn_javafilter NULL -pk setup_native\source\win32\customactions\quickstarter nmake - w sn_quickstarter NULL -pk setup_native\source\win32\customactions\shellextensions nmake - w sn_shellextensions sn_tools.w NULL -pk setup_native\source\win32\customactions\indexingfilter nmake - w sn_indexingfilter NULL -pk setup_native\source\win32\wintools\makecab nmake - u sn_makecab NULL -pk setup_native\source\win32\wintools\msidb nmake - u sn_msidb NULL -pk setup_native\source\win32\wintools\msiinfo nmake - u sn_msiinfo NULL -pk setup_native\source\win32\wintools\msimsp nmake - u sn_msimsp NULL -pk setup_native\source\win32\wintools\msitran nmake - u sn_msitrans NULL +pk setup_native\prj nmake - u sn_setup_native NULL diff --git a/setup_native/prj/d.lst b/setup_native/prj/d.lst index 15abb0fb68c6..e69de29bb2d1 100644 --- a/setup_native/prj/d.lst +++ b/setup_native/prj/d.lst @@ -1,42 +0,0 @@ -mkdir: %_DEST%\bin\osl -..\%__SRC%\bin\*.dll %_DEST%\bin\*.dll -..\%__SRC%\bin\*.exe %_DEST%\bin\*.exe -..\%__SRC%\bin\*.exe.so %_DEST%\bin\*.exe.so -..\%__SRC%\class\*.jar %_DEST%\bin\*.jar -symlink: %_DEST%\bin\makecab.exe %_DEST%\bin\makecab -symlink: %_DEST%\bin\msidb.exe %_DEST%\bin\msidb -symlink: %_DEST%\bin\msiinfo.exe %_DEST%\bin\msiinfo -symlink: %_DEST%\bin\msimsp.exe %_DEST%\bin\msimsp -symlink: %_DEST%\bin\msitran.exe %_DEST%\bin\msitran - -mkdir: %_DEST%\bin\userscripts -..\%__SRC%\bin\install %_DEST%\bin\userscripts\install -..\%__SRC%\bin\uninstall %_DEST%\bin\userscripts\uninstall -..\%__SRC%\bin\noarch\fake-db-1.0-0.noarch.rpm %_DEST%\bin\openoffice.org-userland-1.0-0.noarch.rpm - -..\%__SRC%\bin\langpackscript.sh %_DEST%\bin\langpackscript.sh -..\%__SRC%\bin\downloadscript.sh %_DEST%\bin\downloadscript.sh -..\%__SRC%\bin\unpack_update.sh %_DEST%\bin\unpack_update -..\%__SRC%\bin\update.sh %_DEST%\bin\update -..\%__SRC%\bin\javaloader.sh %_DEST%\bin\javaloader.sh -..\%__SRC%\misc\mac_ulffiles_dest\*.ulf %_DEST%\bin\*.ulf -..\source\win32\patchlist.txt %_DEST%\bin\patchlist.txt -..\source\win32\desktophelper.txt %_DEST%\bin\desktophelper.txt -..\source\win32\get_retval.bat %_DEST%\bin\get_retval.bat -..\source\linux\*.dat %_DEST%\bin\*.dat -..\source\mac\*.icns %_DEST%\bin\*.icns -..\source\mac\Info.plist.langpack %_DEST%\bin\Info.plist.langpack -..\source\mac\ooo\osxdndinstall.png %_DEST%\bin\osl\osxdndinstall.png -..\source\mac\ooo\DS_Store %_DEST%\bin\osl\DS_Store -..\source\mac\ooo\DS_Store_Dev %_DEST%\bin\osl\DS_Store_Dev -..\source\mac\ooo\DS_Store_Langpack %_DEST%\bin\osl\DS_Store_Langpack -..\source\packinfo\solariscopyrightfile %_DEST%\bin\solariscopyrightfile -..\source\packinfo\linuxcopyrightfile %_DEST%\bin\linuxcopyrightfile -..\source\packinfo\*.txt %_DEST%\bin\*.txt -..\source\packinfo\*.pcp %_DEST%\bin\*.pcp -..\scripts\admin.pl %_DEST%\bin\admin.pl -..\scripts\*.txt %_DEST%\bin\*.txt -..\scripts\mac_install.script %_DEST%\bin\mac_install.script -..\scripts\osx_install_languagepack.applescript %_DEST%\bin\osx_install_languagepack.applescript - -..\%__SRC%\lib\getuid.so %_DEST%\bin\getuid.so diff --git a/setup_native/prj/dmake b/setup_native/prj/dmake deleted file mode 100644 index e69de29bb2d1..000000000000 --- a/setup_native/prj/dmake +++ /dev/null diff --git a/setup_native/scripts/makefile.mk b/setup_native/scripts/makefile.mk deleted file mode 100644 index f7c828cd561d..000000000000 --- a/setup_native/scripts/makefile.mk +++ /dev/null @@ -1,90 +0,0 @@ -# -# 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 . -# - -PRJ=.. - -PRJNAME=setup_native -TARGET=install - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.IF "$(L10N_framework)"=="" -# --- Files -------------------------------------------------------- - -UNIXTEXT= \ - $(BIN)$/langpackscript.sh \ - $(BIN)$/javaloader.sh \ - $(BIN)$/update.sh \ - $(BIN)$/downloadscript.sh - -.IF "$(ENABLE_ONLINE_UPDATE)" == "TRUE" -UNIXTEXT += $(BIN)$/unpack_update.sh -.END - -NOARCH=$(BIN)$/noarch -FAKEDB=$(NOARCH)/fake-db-1.0-0.noarch.rpm -FAKEDBROOT=$(COMMONMISC)/$(TARGET)/fake-db-root - -# --- Targets ------------------------------------------------------ - -.ENDIF # L10N_framework -.INCLUDE : target.mk -.IF "$(L10N_framework)"=="" -.IF "$(OS)" == "SOLARIS" || ( "$(OS)" == "LINUX" && "$(PKGFORMAT)"!="$(PKGFORMAT:s/rpm//)" ) - -ALLTAR: $(BIN)$/install $(BIN)$/uninstall - -$(BIN)$/install: install_$(OS:l).sh - $(PERL) install_create.pl $& $@ - -chmod 775 $@ - -.ENDIF - -.IF "$(OS)" == "LINUX" -.IF "$(PKGFORMAT)"!="$(PKGFORMAT:s/rpm//)" - -$(FAKEDB) : fake-db.spec - $(MKDIRHIER) $(FAKEDBROOT) - $(RPM) --define "_builddir $(shell @cd $(FAKEDBROOT) && pwd)" --define "_rpmdir $(shell @cd $(BIN) && pwd)" -bb $< - chmod g+w $(NOARCH) - -$(BIN)$/install: $(FAKEDB) -.ENDIF # "$(PKGFORMAT)"!="$(PKGFORMAT:s/rpm//)" - -$(BIN)$/uninstall: uninstall_linux.sh - $(TYPE) $< | tr -d "\015" > $@ - -chmod 775 $@ - -.ENDIF # "$(OS)" == "LINUX" - -.IF "$(OS)" == "SOLARIS" - -$(BIN)$/install: $(LB)$/getuid.so.stripped - -$(BIN)$/uninstall: uninstall_solaris.sh $(LB)$/getuid.so.stripped - $(PERL) install_create.pl $< $@ - -chmod 775 $@ - -$(LB)$/getuid.so.stripped: $(LB)$/getuid.so - @$(COPY) $< $@ - @/usr/ccs/bin/strip $@ - -.ENDIF - -.ENDIF # L10N_framework diff --git a/setup_native/scripts/source/makefile.mk b/setup_native/scripts/source/makefile.mk deleted file mode 100644 index d4c86cbd9b4a..000000000000 --- a/setup_native/scripts/source/makefile.mk +++ /dev/null @@ -1,81 +0,0 @@ -# -# 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 . -# - -PRJ=..$/.. - -PRJNAME=setup_native -TARGET=getuid - -NO_DEFAULT_STL=TRUE -LIBSALCPPRT=$(0) -LIBTARGET=NO - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -# --- Files -------------------------------------------------------- - -# no 'lib' prefix -DLLPRE= - -# no _version.o -VERSIONOBJ= - -.IF "$(OS)" == "LINUX" || "$(OS)" == "SOLARIS" - -.IF "$(OS)" == "LINUX" -CFLAGS+=-D_GNU_SOURCE -.ENDIF - -.IF "$(OS)" == "SOLARIS" -.IF "$(CPUNAME)" == "INTEL" -.IF "$(COM)" != "GCC" -CFLAGS+=-D_KERNEL -.ENDIF -.ENDIF -.ENDIF - -# this object must not be a Ultra SPARC binary, this does not -# work with /usr/bin/sort and such. Needs to be 32 bit even in -# 64 bit builds -.IF "$(OS)" == "SOLARIS" -.IF "$(COM)" != "GCC" -.IF "$(CPUNAME)" == "SPARC" -ENVCFLAGS=-xarch=v8 -.ENDIF -.IF "$(CPU)"=="U" -CFLAGSAPPEND+=-m32 -LINKFLAGSSHL+=-m32 -.ENDIF -.ENDIF -.ENDIF - -SLOFILES = $(SLO)$/getuid.obj - -SHL1OBJS=$(SLOFILES) -SHL1TARGET=$(TARGET) -SHL1STDLIBS=-ldl -SHL1CODETYPE=C - -.ENDIF - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk - diff --git a/setup_native/source/mac/makefile.mk b/setup_native/source/mac/makefile.mk deleted file mode 100644 index e79f26cea099..000000000000 --- a/setup_native/source/mac/makefile.mk +++ /dev/null @@ -1,48 +0,0 @@ -# -# 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 . -# - -PRJ=..$/.. - -PRJNAME=setup_native -TARGET=mac_ulffiles - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -# ------------------------------------------------------------------ - -ULFFILES = macinstall.ulf - -ULFDESTFILES=$(foreach,i,$(ULFFILES) $(MISC)$/$(TARGET)_dest$/$i) - -# --- Targets ------------------------------------------------------ - -.IF "$(OS)"=="MACOSX" -ALLTAR : $(ULFDESTFILES) -.ENDIF - -.INCLUDE : target.mk - -.IF "$(WITH_LANG)"!="" -$(MISC)$/$(TARGET)_dest$/%.ulf : $(COMMONMISC)$/$(TARGET)$/%.ulf -.ELSE # "$(WITH_LANG)"!="" -$(MISC)$/$(TARGET)_dest$/%.ulf : %.ulf -.ENDIF # "$(WITH_LANG)"!="" - @-$(MKDIRHIER) $(MISC)$/$(TARGET)_dest - $(COPY) $< $@ diff --git a/setup_native/source/win32/customactions/indexingfilter/exports.dxp b/setup_native/source/win32/customactions/indexingfilter/exports.dxp deleted file mode 100644 index bb23f3d02803..000000000000 --- a/setup_native/source/win32/customactions/indexingfilter/exports.dxp +++ /dev/null @@ -1,3 +0,0 @@ -RestartIndexingService - -
\ No newline at end of file diff --git a/setup_native/source/win32/customactions/indexingfilter/makefile.mk b/setup_native/source/win32/customactions/indexingfilter/makefile.mk deleted file mode 100644 index 874c9651afc6..000000000000 --- a/setup_native/source/win32/customactions/indexingfilter/makefile.mk +++ /dev/null @@ -1,59 +0,0 @@ -# -# 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 . -# - -PRJ=..$/..$/..$/.. -PRJNAME=setup_native -TARGET=instooofiltmsi - -# --- Settings ----------------------------------------------------- - -ENABLE_EXCEPTIONS=TRUE -DYNAMIC_CRT= -NO_DEFAULT_STL=TRUE -USE_DEFFILE=TRUE - -.INCLUDE : settings.mk - -# --- Files -------------------------------------------------------- - -.IF "$(OS)"=="WNT" - -UWINAPILIB= - -SLOFILES = $(SLO)$/restartindexingservice.obj - -SHL1LIBS = $(SLB)$/$(TARGET).lib - -SHL1TARGET = $(TARGET) -SHL1IMPLIB = i$(TARGET) - -SHL1DEF = $(MISC)$/$(SHL1TARGET).def -SHL1DEPN = $(SLB)$/$(TARGET).lib -SHL1BASE = 0x1c000000 -DEF1NAME=$(SHL1TARGET) -DEF1EXPORTFILE=exports.dxp - -.ENDIF - -# --- Targets -------------------------------------------------------------- - -.INCLUDE : target.mk - -# ------------------------------------------------------------------------- - - diff --git a/setup_native/source/win32/customactions/indexingfilter/restartindexingservice.cxx b/setup_native/source/win32/customactions/indexingfilter/restartindexingservice.cxx index f68936f176e2..d73080795843 100644 --- a/setup_native/source/win32/customactions/indexingfilter/restartindexingservice.cxx +++ b/setup_native/source/win32/customactions/indexingfilter/restartindexingservice.cxx @@ -148,7 +148,7 @@ void StartIndexingService(SC_HANDLE hService) } } -extern "C" UINT __stdcall RestartIndexingService(MSIHANDLE) +extern "C" __declspec(dllexport) UINT __stdcall RestartIndexingService(MSIHANDLE) { //MessageBox(NULL, TEXT("Restarting Indexing Service"), TEXT("Message"), MB_OK | MB_ICONINFORMATION); diff --git a/setup_native/source/win32/customactions/javafilter/exports.dxp b/setup_native/source/win32/customactions/javafilter/exports.dxp deleted file mode 100644 index 209a9ed2a5f3..000000000000 --- a/setup_native/source/win32/customactions/javafilter/exports.dxp +++ /dev/null @@ -1,2 +0,0 @@ -install_jf -uninstall_jf diff --git a/setup_native/source/win32/customactions/javafilter/jfregca.cxx b/setup_native/source/win32/customactions/javafilter/jfregca.cxx index 77c48c5ba613..841bdf6e066e 100644 --- a/setup_native/source/win32/customactions/javafilter/jfregca.cxx +++ b/setup_native/source/win32/customactions/javafilter/jfregca.cxx @@ -92,7 +92,7 @@ BOOL APIENTRY DllMain( HANDLE, return TRUE; } -extern "C" UINT install_jf ( MSIHANDLE hModule ) { +extern "C" UINT __declspec(dllexport) install_jf ( MSIHANDLE hModule ) { bool bMulti = isMulti(hModule); #ifdef _JRGREG_DEBUG MessageBox(NULL, bMulti ? "Multi" : "Single", "Install", MB_OK); @@ -103,7 +103,7 @@ extern "C" UINT install_jf ( MSIHANDLE hModule ) { return ERROR_SUCCESS; } -extern "C" UINT uninstall_jf ( MSIHANDLE hModule ) { +extern "C" UINT _declspec(dllexport) uninstall_jf ( MSIHANDLE hModule ) { bool bMulti = isMulti(hModule); #ifdef _JRGREG_DEBUG MessageBox(NULL, bMulti ? "Multi" : "Single", "Uninstall", MB_OK); diff --git a/setup_native/source/win32/customactions/javafilter/makefile.mk b/setup_native/source/win32/customactions/javafilter/makefile.mk deleted file mode 100644 index aef948cad52a..000000000000 --- a/setup_native/source/win32/customactions/javafilter/makefile.mk +++ /dev/null @@ -1,61 +0,0 @@ -# -# 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 . -# - -PRJ=..$/..$/..$/.. -PRJNAME=setup_native -TARGET=jfregca - - -# --- Settings ----------------------------------------------------- - -NO_DEFAULT_STL=TRUE -ENABLE_EXCEPTIONS=TRUE -DYNAMIC_CRT= - -.INCLUDE : settings.mk - -# --- Files -------------------------------------------------------- - -.IF "$(OS)"=="WNT" && "$(WINDOWS_SDK_HOME)"!="" - -UWINAPILIB= - -SLOFILES = $(SLO)$/jfregca.obj - -STDSHL += \ - $(ADVAPI32LIB)\ - $(MSILIB) - -SHL1LIBS = $(SLB)$/$(TARGET).lib - -SHL1TARGET = $(TARGET) -SHL1IMPLIB = i$(TARGET) - -SHL1DEF = $(MISC)$/$(SHL1TARGET).def -SHL1DEPN = $(SLB)$/$(TARGET).lib -SHL1BASE = 0x1c000000 -DEF1NAME=$(SHL1TARGET) -DEF1EXPORTFILE=exports.dxp - -.ENDIF - -# --- Targets -------------------------------------------------------------- - -.INCLUDE : target.mk - -# ------------------------------------------------------------------------- diff --git a/setup_native/source/win32/customactions/quickstarter/exports.dxp b/setup_native/source/win32/customactions/quickstarter/exports.dxp deleted file mode 100644 index c1343f8e7e76..000000000000 --- a/setup_native/source/win32/customactions/quickstarter/exports.dxp +++ /dev/null @@ -1,3 +0,0 @@ -InstallExecSequenceEntry -DeinstallExecSequenceEntry -
\ No newline at end of file diff --git a/setup_native/source/win32/customactions/quickstarter/makefile.mk b/setup_native/source/win32/customactions/quickstarter/makefile.mk deleted file mode 100644 index d0a6a3c460db..000000000000 --- a/setup_native/source/win32/customactions/quickstarter/makefile.mk +++ /dev/null @@ -1,84 +0,0 @@ -# -# 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 . -# - -PRJ=..$/..$/..$/.. -PRJNAME=setup_native -TARGET=quickstarter -TARGET1=sdqsmsi -TARGET2=qslnkmsi - -# --- Settings ----------------------------------------------------- - -LIBTARGET=NO -ENABLE_EXCEPTIONS=TRUE -NO_DEFAULT_STL=TRUE -DYNAMIC_CRT= -USE_DEFFILE=TRUE - -.INCLUDE : settings.mk - -UWINAPILIB= - -# --- Files -------------------------------------------------------- - -.IF "$(OS)"=="WNT" && "$(WINDOWS_SDK_HOME)"!="" - -STDSHL += \ - $(ADVAPI32LIB)\ - $(SHELL32LIB)\ - $(MSILIB) - -.IF "$(COM)"=="GCC" -STDSHL+= \ - $(KERNEL32LIB)\ - -lmsvcrt -.ENDIF - -SHL1OBJS = $(SLO)$/shutdown_quickstart.obj \ - $(SLO)$/quickstarter.obj - -SHL1TARGET = $(TARGET1) -SHL1IMPLIB = i$(TARGET1) - -SHL1DEF = $(MISC)$/$(SHL1TARGET).def -SHL1BASE = 0x1c000000 -DEF1NAME=$(SHL1TARGET) -SHL1DEPN=$(SHL1OBJS) -DEF1EXPORTFILE=$(TARGET1).dxp - -# --- Files -------------------------------------------------------- - -SHL2OBJS = $(SLO)$/remove_quickstart_link.obj \ - $(SLO)$/quickstarter.obj - -SHL2TARGET = $(TARGET2) -SHL2IMPLIB = i$(TARGET2) - -SHL2DEF = $(MISC)$/$(SHL2TARGET).def -SHL2BASE = 0x1c000000 -DEF2NAME=$(SHL2TARGET) -SHL2DEPN=$(SHL1OBJS) -DEF2EXPORTFILE=$(TARGET2).dxp - -.ENDIF - -# --- Targets -------------------------------------------------------------- - -.INCLUDE : target.mk - -# ------------------------------------------------------------------------- diff --git a/setup_native/source/win32/customactions/quickstarter/qslnkmsi.dxp b/setup_native/source/win32/customactions/quickstarter/qslnkmsi.dxp deleted file mode 100644 index 56f67cc93783..000000000000 --- a/setup_native/source/win32/customactions/quickstarter/qslnkmsi.dxp +++ /dev/null @@ -1,2 +0,0 @@ -RemoveQuickstarterLink -
\ No newline at end of file diff --git a/setup_native/source/win32/customactions/quickstarter/remove_quickstart_link.cxx b/setup_native/source/win32/customactions/quickstarter/remove_quickstart_link.cxx index bbd4f02009fd..298f9b6c0774 100644 --- a/setup_native/source/win32/customactions/quickstarter/remove_quickstart_link.cxx +++ b/setup_native/source/win32/customactions/quickstarter/remove_quickstart_link.cxx @@ -33,7 +33,7 @@ #include "quickstarter.hxx" -extern "C" UINT __stdcall RemoveQuickstarterLink( MSIHANDLE hMSI ) +extern "C" __declspec(dllexport) UINT __stdcall RemoveQuickstarterLink( MSIHANDLE hMSI ) { CHAR szStartupPath[MAX_PATH]; diff --git a/setup_native/source/win32/customactions/quickstarter/sdqsmsi.dxp b/setup_native/source/win32/customactions/quickstarter/sdqsmsi.dxp deleted file mode 100644 index 49ec00aff0d8..000000000000 --- a/setup_native/source/win32/customactions/quickstarter/sdqsmsi.dxp +++ /dev/null @@ -1,2 +0,0 @@ -ShutDownQuickstarter -
\ No newline at end of file diff --git a/setup_native/source/win32/customactions/quickstarter/shutdown_quickstart.cxx b/setup_native/source/win32/customactions/quickstarter/shutdown_quickstart.cxx index d40d378bfadb..bf128b4fb0cd 100644 --- a/setup_native/source/win32/customactions/quickstarter/shutdown_quickstart.cxx +++ b/setup_native/source/win32/customactions/quickstarter/shutdown_quickstart.cxx @@ -62,7 +62,7 @@ static BOOL CALLBACK EnumWindowsProc( HWND hWnd, LPARAM lParam ) } -extern "C" UINT __stdcall ShutDownQuickstarter( MSIHANDLE hMSI ) +extern "C" __declspec(dllexport) UINT __stdcall ShutDownQuickstarter( MSIHANDLE hMSI ) { EnumWindows( EnumWindowsProc, hMSI ); diff --git a/setup_native/source/win32/customactions/reg4allmsdoc/exports.dxp b/setup_native/source/win32/customactions/reg4allmsdoc/exports.dxp deleted file mode 100644 index 54ebb2f675f4..000000000000 --- a/setup_native/source/win32/customactions/reg4allmsdoc/exports.dxp +++ /dev/null @@ -1,4 +0,0 @@ -FindRegisteredExtensions -LookForRegisteredExtensions -RegisterSomeExtensions -RestoreRegAllMSDoc diff --git a/setup_native/source/win32/customactions/reg4allmsdoc/makefile.mk b/setup_native/source/win32/customactions/reg4allmsdoc/makefile.mk deleted file mode 100644 index d9c111df4fb8..000000000000 --- a/setup_native/source/win32/customactions/reg4allmsdoc/makefile.mk +++ /dev/null @@ -1,67 +0,0 @@ -# -# 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 . -# - -PRJ=..$/..$/..$/.. -PRJNAME=setup_native -TARGET=reg4allmsdoc - -# --- Settings ----------------------------------------------------- - -ENABLE_EXCEPTIONS=TRUE -NO_DEFAULT_STL=TRUE -DYNAMIC_CRT= -USE_DEFFILE=TRUE - -.INCLUDE : settings.mk - -CFLAGS+=-DUNICODE -D_UNICODE - -# --- Files -------------------------------------------------------- - -.IF "$(OS)"=="WNT" && "$(WINDOWS_SDK_HOME)"!="" - -UWINAPILIB= - -SLOFILES = $(SLO)$/reg4allmsi.obj - -SHL1STDLIBS= $(KERNEL32LIB)\ - $(USER32LIB)\ - $(ADVAPI32LIB)\ - $(SHELL32LIB)\ - $(MSILIB)\ - $(SHLWAPILIB) - -SHL1LIBS = $(SLB)$/$(TARGET).lib - -SHL1TARGET = $(TARGET) -SHL1IMPLIB = i$(TARGET) - -SHL1DEF = $(MISC)$/$(SHL1TARGET).def -SHL1DEPN = $(SLB)$/$(TARGET).lib -SHL1BASE = 0x1c000000 -DEF1NAME=$(SHL1TARGET) -DEF1EXPORTFILE=exports.dxp - -.ENDIF - -# --- Targets -------------------------------------------------------------- - -.INCLUDE : target.mk - -# ------------------------------------------------------------------------- - diff --git a/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx b/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx index a0f930ad7d35..fa0506e35212 100644 --- a/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx +++ b/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx @@ -302,7 +302,7 @@ static void registerSomeExtensions( MSIHANDLE handle, const int nStart, const in } } -extern "C" UINT __stdcall LookForRegisteredExtensions( MSIHANDLE handle ) +extern "C" __declspec(dllexport) UINT __stdcall LookForRegisteredExtensions( MSIHANDLE handle ) { OutputDebugStringFormat( "LookForRegisteredExtensions: " ); @@ -403,7 +403,7 @@ extern "C" UINT __stdcall LookForRegisteredExtensions( MSIHANDLE handle ) return ERROR_SUCCESS; } -extern "C" UINT __stdcall RegisterSomeExtensions( MSIHANDLE handle ) +extern "C" __declspec(dllexport) UINT __stdcall RegisterSomeExtensions( MSIHANDLE handle ) { OutputDebugStringFormat( "RegisterSomeExtensions: " ); @@ -457,7 +457,7 @@ extern "C" UINT __stdcall RegisterSomeExtensions( MSIHANDLE handle ) return ERROR_SUCCESS; } -extern "C" UINT __stdcall FindRegisteredExtensions( MSIHANDLE handle ) +extern "C" __declspec(dllexport) UINT __stdcall FindRegisteredExtensions( MSIHANDLE handle ) { if ( IsSetMsiProp( handle, "FILETYPEDIALOGUSED" ) ) { @@ -546,7 +546,7 @@ static void restoreOldRegistration( LPCSTR lpSubKey ) } } -extern "C" UINT __stdcall RestoreRegAllMSDoc( MSIHANDLE /*handle*/ ) +extern "C" __declspec(dllexport) UINT __stdcall RestoreRegAllMSDoc( MSIHANDLE /*handle*/ ) { OutputDebugStringFormat( "RestoreRegAllMSDoc\n" ); diff --git a/setup_native/source/win32/customactions/regactivex/exports.dxp b/setup_native/source/win32/customactions/regactivex/exports.dxp deleted file mode 100644 index 0ad8ce403a81..000000000000 --- a/setup_native/source/win32/customactions/regactivex/exports.dxp +++ /dev/null @@ -1,2 +0,0 @@ -InstallActiveXControl -DeinstallActiveXControl diff --git a/setup_native/source/win32/customactions/regactivex/makefile.mk b/setup_native/source/win32/customactions/regactivex/makefile.mk deleted file mode 100644 index c96e2980d7cf..000000000000 --- a/setup_native/source/win32/customactions/regactivex/makefile.mk +++ /dev/null @@ -1,60 +0,0 @@ -# -# 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 . -# - -PRJ=..$/..$/..$/.. -PRJNAME=setup_native -TARGET=regactivex - -# --- Settings ----------------------------------------------------- - -ENABLE_EXCEPTIONS=TRUE -NO_DEFAULT_STL=TRUE -DYNAMIC_CRT= -USE_DEFFILE=TRUE - -.INCLUDE : settings.mk - -# --- Files -------------------------------------------------------- - -.IF "$(OS)"=="WNT" && "$(WINDOWS_SDK_HOME)"!="" - -UWINAPILIB= - -SLOFILES = $(SLO)$/regactivex.obj - -STDSHL += \ - $(MSILIB) - -SHL1LIBS = $(SLB)$/$(TARGET).lib - -SHL1TARGET = $(TARGET) -SHL1IMPLIB = i$(TARGET) - -SHL1DEF = $(MISC)$/$(SHL1TARGET).def -SHL1DEPN = $(SLB)$/$(TARGET).lib -SHL1BASE = 0x1c000000 -DEF1NAME=$(SHL1TARGET) -DEF1EXPORTFILE=exports.dxp - -.ENDIF - -# --- Targets -------------------------------------------------------------- - -.INCLUDE : target.mk - -# ------------------------------------------------------------------------- diff --git a/setup_native/source/win32/customactions/regactivex/regactivex.cxx b/setup_native/source/win32/customactions/regactivex/regactivex.cxx index 7be03a2dabc4..10175d63713a 100644 --- a/setup_native/source/win32/customactions/regactivex/regactivex.cxx +++ b/setup_native/source/win32/customactions/regactivex/regactivex.cxx @@ -294,7 +294,7 @@ BOOL MakeInstallFor64Bit( MSIHANDLE hMSI ) return bResult; } //---------------------------------------------------------- -extern "C" UINT __stdcall InstallActiveXControl( MSIHANDLE hMSI ) +extern "C" __declspec(dllexport) UINT __stdcall InstallActiveXControl( MSIHANDLE hMSI ) { INSTALLSTATE current_state; INSTALLSTATE future_state; @@ -341,7 +341,7 @@ extern "C" UINT __stdcall InstallActiveXControl( MSIHANDLE hMSI ) } //---------------------------------------------------------- -extern "C" UINT __stdcall DeinstallActiveXControl( MSIHANDLE hMSI ) +extern "C" __declspec(dllexport) UINT __stdcall DeinstallActiveXControl( MSIHANDLE hMSI ) { INSTALLSTATE current_state; INSTALLSTATE future_state; diff --git a/setup_native/source/win32/customactions/regpatchactivex/exports.dxp b/setup_native/source/win32/customactions/regpatchactivex/exports.dxp deleted file mode 100644 index c1d75133584b..000000000000 --- a/setup_native/source/win32/customactions/regpatchactivex/exports.dxp +++ /dev/null @@ -1 +0,0 @@ -PatchActiveXControl diff --git a/setup_native/source/win32/customactions/regpatchactivex/makefile.mk b/setup_native/source/win32/customactions/regpatchactivex/makefile.mk deleted file mode 100644 index cbc2652efbb6..000000000000 --- a/setup_native/source/win32/customactions/regpatchactivex/makefile.mk +++ /dev/null @@ -1,78 +0,0 @@ -# -# 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 . -# - -PRJ=..$/..$/..$/.. -PRJNAME=setup_native -TARGET=regpatchactivex -USE_DEFFILE=TRUE - -# --- Settings ----------------------------------------------------- - -ENABLE_EXCEPTIONS=TRUE - -.INCLUDE : settings.mk - -.IF "$(OS)"=="WNT" && "$(WINDOWS_SDK_HOME)"!="" - -STDSHL= - -# --- Files -------------------------------------------------------- - -INCPRE+=.\Include -.DIRCACHE=NO - -SLOFILES = $(SLO)$/regpatchactivex.obj - -.IF "$(COM)"=="GCC" -SHL1STDLIBS += -lstdc++ -.IF "$(MINGW_GCCLIB_EH)"=="YES" -SHL1STDLIBS += -lgcc_eh -.ENDIF -SHL1STDLIBS += -lgcc -lmingw32 -lmoldname -lmsvcrt -.ELSE -SHL1STDLIBS= -.ENDIF - -SHL1STDLIBS+= $(KERNEL32LIB)\ - $(USER32LIB)\ - $(ADVAPI32LIB)\ - $(SHELL32LIB)\ - $(MSILIB) -.IF "$(COM)"!="GCC" -SHL1STDLIBS+= libcmt.lib -.ENDIF - - -SHL1LIBS = $(SLB)$/$(TARGET).lib - -SHL1TARGET = $(TARGET) -SHL1IMPLIB = i$(TARGET) - -SHL1DEF = $(MISC)$/$(SHL1TARGET).def -SHL1DEPN = $(SLB)$/$(TARGET).lib -SHL1BASE = 0x1c000000 -DEF1NAME=$(SHL1TARGET) -DEF1EXPORTFILE=exports.dxp - -.ENDIF - -# --- Targets -------------------------------------------------------------- - -.INCLUDE : target.mk - -# ------------------------------------------------------------------------- diff --git a/setup_native/source/win32/customactions/regpatchactivex/regpatchactivex.cxx b/setup_native/source/win32/customactions/regpatchactivex/regpatchactivex.cxx index 0c51ccb8f97e..c0945b7380b3 100644 --- a/setup_native/source/win32/customactions/regpatchactivex/regpatchactivex.cxx +++ b/setup_native/source/win32/customactions/regpatchactivex/regpatchactivex.cxx @@ -80,7 +80,7 @@ BOOL MakeInstallForAllUsers( MSIHANDLE hMSI ) } //---------------------------------------------------------- -extern "C" UINT __stdcall PatchActiveXControl( MSIHANDLE hMSI ) +extern "C" __declspec(dllexport) UINT __stdcall PatchActiveXControl( MSIHANDLE hMSI ) { // MessageBox(NULL, L"PatchActiveXControl", L"Information", MB_OK | MB_ICONINFORMATION); diff --git a/setup_native/source/win32/customactions/sellang/exports.dxp b/setup_native/source/win32/customactions/sellang/exports.dxp deleted file mode 100644 index c8a622e2641c..000000000000 --- a/setup_native/source/win32/customactions/sellang/exports.dxp +++ /dev/null @@ -1,2 +0,0 @@ -SelectLanguage -SortTree diff --git a/setup_native/source/win32/customactions/sellang/makefile.mk b/setup_native/source/win32/customactions/sellang/makefile.mk deleted file mode 100644 index 7470886ca82d..000000000000 --- a/setup_native/source/win32/customactions/sellang/makefile.mk +++ /dev/null @@ -1,68 +0,0 @@ -# -# 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 . -# - -PRJ=..$/..$/..$/.. -PRJNAME=setup_native -TARGET=sellangmsi - -# --- Settings ----------------------------------------------------- - -ENABLE_EXCEPTIONS=TRUE -NO_DEFAULT_STL=TRUE -DYNAMIC_CRT= -USE_DEFFILE=TRUE - -.INCLUDE : settings.mk - -.IF "$(OS)"=="WNT" && "$(WINDOWS_SDK_HOME)"!="" - -CFLAGS+=-D_STLP_USE_STATIC_LIB - -# --- Files -------------------------------------------------------- - -UWINAPILIB= - -SLOFILES = \ - $(SLO)/sellang.obj \ - $(SLO)/sorttree.obj - -SHL1STDLIBS= \ - $(KERNEL32LIB)\ - $(USER32LIB)\ - $(ADVAPI32LIB)\ - $(SHELL32LIB)\ - $(MSILIB) - -SHL1LIBS = $(SLB)$/$(TARGET).lib - -SHL1TARGET = $(TARGET) -SHL1IMPLIB = i$(TARGET) - -SHL1DEF = $(MISC)$/$(SHL1TARGET).def -SHL1DEPN = $(SLB)$/$(TARGET).lib -SHL1BASE = 0x1c000000 -DEF1NAME=$(SHL1TARGET) -DEF1EXPORTFILE=exports.dxp - -.ENDIF - -# --- Targets -------------------------------------------------------------- - -.INCLUDE : target.mk - -# ------------------------------------------------------------------------- diff --git a/setup_native/source/win32/customactions/sellang/sellang.cxx b/setup_native/source/win32/customactions/sellang/sellang.cxx index b6f7ec559ea0..14576d1d31b8 100644 --- a/setup_native/source/win32/customactions/sellang/sellang.cxx +++ b/setup_native/source/win32/customactions/sellang/sellang.cxx @@ -232,7 +232,7 @@ void addMatchingDictionaries( } -extern "C" UINT __stdcall SelectLanguage( MSIHANDLE handle ) +extern "C" __declspec(dllexport) UINT __stdcall SelectLanguage( MSIHANDLE handle ) { char feature[100]; MSIHANDLE database, view, record; diff --git a/setup_native/source/win32/customactions/sellang/sorttree.cxx b/setup_native/source/win32/customactions/sellang/sorttree.cxx index 9472a49bd82d..e0f3169d0a0b 100644 --- a/setup_native/source/win32/customactions/sellang/sorttree.cxx +++ b/setup_native/source/win32/customactions/sellang/sorttree.cxx @@ -18,7 +18,7 @@ #pragma warning(pop) #endif -extern "C" UINT __stdcall SortTree(MSIHANDLE) +extern "C" __declspec(dllexport) UINT __stdcall SortTree(MSIHANDLE) { // Sort items (languages) in SelectionTree control, fdo#46355 diff --git a/setup_native/source/win32/customactions/shellextensions/checkdirectory.cxx b/setup_native/source/win32/customactions/shellextensions/checkdirectory.cxx index 7b35b3cf518c..224bdaf1c349 100644 --- a/setup_native/source/win32/customactions/shellextensions/checkdirectory.cxx +++ b/setup_native/source/win32/customactions/shellextensions/checkdirectory.cxx @@ -74,7 +74,7 @@ static void SetMsiProperty(MSIHANDLE handle, const std::_tstring& sProperty, con MsiSetProperty(handle, sProperty.c_str(), TEXT("1")); } -extern "C" UINT __stdcall CheckInstallDirectory(MSIHANDLE handle) +extern "C" __declspec(dllexport) UINT __stdcall CheckInstallDirectory(MSIHANDLE handle) { std::_tstring sInstallPath = GetMsiProperty(handle, TEXT("INSTALLLOCATION")); std::_tstring sOfficeHostnamePath = GetMsiProperty(handle, TEXT("OFFICEDIRHOSTNAME")); diff --git a/setup_native/source/win32/customactions/shellextensions/checkpatches.cxx b/setup_native/source/win32/customactions/shellextensions/checkpatches.cxx index 94a24cd7687c..6e48e038262e 100644 --- a/setup_native/source/win32/customactions/shellextensions/checkpatches.cxx +++ b/setup_native/source/win32/customactions/shellextensions/checkpatches.cxx @@ -86,7 +86,7 @@ static void SetMsiProperty( MSIHANDLE handle, const std::_tstring& sProperty ) MsiSetProperty( handle, sProperty.c_str(), TEXT("1") ); } -extern "C" UINT __stdcall CheckPatchList( MSIHANDLE handle ) +extern "C" __declspec(dllexport) UINT __stdcall CheckPatchList( MSIHANDLE handle ) { std::_tstring sPatchList = GetMsiProperty( handle, TEXT("PATCH") ); std::_tstring sRequiredPatch = GetMsiProperty( handle, TEXT("PREREQUIREDPATCH") ); diff --git a/setup_native/source/win32/customactions/shellextensions/completeinstallpath.cxx b/setup_native/source/win32/customactions/shellextensions/completeinstallpath.cxx index d56ad5e7db15..c06413d4fb46 100644 --- a/setup_native/source/win32/customactions/shellextensions/completeinstallpath.cxx +++ b/setup_native/source/win32/customactions/shellextensions/completeinstallpath.cxx @@ -62,7 +62,7 @@ namespace } } // namespace -extern "C" UINT __stdcall CompleteInstallPath( MSIHANDLE handle ) +extern "C" __declspec(dllexport) UINT __stdcall CompleteInstallPath( MSIHANDLE handle ) { // This CustomAction is necessary for updates from OOo 3.0, OOo 3.1 and OOo 3.2 to versions // OOo 3.3 or later. This is caused by a change of INSTALLLOCATION, that starting with OOo 3.3 diff --git a/setup_native/source/win32/customactions/shellextensions/exports.dxp b/setup_native/source/win32/customactions/shellextensions/exports.dxp deleted file mode 100644 index 59a8b3bf34c1..000000000000 --- a/setup_native/source/win32/customactions/shellextensions/exports.dxp +++ /dev/null @@ -1,12 +0,0 @@ -InstallStartmenuFolderIcon -DeinstallStartmenuFolderIcon -SetProductInstallMode -RebuildShellIconCache -CompleteInstallPath -MigrateInstallPath -CheckInstallDirectory -CreateLayerLinks -RemoveLayerLinks -RenamePrgFolder -RemovePrgFolder -CheckPatchList diff --git a/setup_native/source/win32/customactions/shellextensions/iconcache.cxx b/setup_native/source/win32/customactions/shellextensions/iconcache.cxx index 6e87a843e39b..edc66a82dfbe 100644 --- a/setup_native/source/win32/customactions/shellextensions/iconcache.cxx +++ b/setup_native/source/win32/customactions/shellextensions/iconcache.cxx @@ -29,7 +29,7 @@ #include <stdlib.h> -extern "C" UINT __stdcall RebuildShellIconCache(MSIHANDLE) +extern "C" __declspec(dllexport) UINT __stdcall RebuildShellIconCache(MSIHANDLE) { // Rebuild icon cache on windows OS prior XP diff --git a/setup_native/source/win32/customactions/shellextensions/layerlinks.cxx b/setup_native/source/win32/customactions/shellextensions/layerlinks.cxx index 88e020f5b27e..893020f8b64a 100644 --- a/setup_native/source/win32/customactions/shellextensions/layerlinks.cxx +++ b/setup_native/source/win32/customactions/shellextensions/layerlinks.cxx @@ -88,7 +88,7 @@ namespace } } // namespace -extern "C" UINT __stdcall CreateLayerLinks(MSIHANDLE handle) +extern "C" __declspec(dllexport) UINT __stdcall CreateLayerLinks(MSIHANDLE handle) { string sInstallPath = GetMsiProperty(handle, TEXT("INSTALLLOCATION")); @@ -147,7 +147,7 @@ extern "C" UINT __stdcall CreateLayerLinks(MSIHANDLE handle) return ERROR_SUCCESS; } -extern "C" UINT __stdcall RemoveLayerLinks(MSIHANDLE handle) +extern "C" __declspec(dllexport) UINT __stdcall RemoveLayerLinks(MSIHANDLE handle) { string sInstallPath = GetMsiProperty(handle, TEXT("INSTALLLOCATION")); diff --git a/setup_native/source/win32/customactions/shellextensions/makefile.mk b/setup_native/source/win32/customactions/shellextensions/makefile.mk deleted file mode 100644 index 93b9888ab193..000000000000 --- a/setup_native/source/win32/customactions/shellextensions/makefile.mk +++ /dev/null @@ -1,82 +0,0 @@ -# -# 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 . -# - -PRJ=..$/..$/..$/.. -PRJNAME=setup_native -TARGET=shlxtmsi - -# --- Settings ----------------------------------------------------- - -ENABLE_EXCEPTIONS=TRUE -NO_DEFAULT_STL=TRUE -DYNAMIC_CRT= -USE_DEFFILE=TRUE - -.INCLUDE : settings.mk - -# --- Files -------------------------------------------------------- - -.IF "$(OS)"=="WNT" && "$(WINDOWS_SDK_HOME)"!="" - -UWINAPILIB= -CFLAGS+=-I$(WORKDIR)/UnpackedTarball/boost - -SLOFILES = \ - $(SLO)$/startmenuicon.obj \ - $(SLO)$/upgrade.obj \ - $(SLO)$/iconcache.obj \ - $(SLO)$/migrateinstallpath.obj \ - $(SLO)$/completeinstallpath.obj \ - $(SLO)$/checkdirectory.obj \ - $(SLO)$/layerlinks.obj \ - $(SLO)$/vistaspecial.obj \ - $(SLO)$/checkpatches.obj - -STDSHL += \ - $(ADVAPI32LIB)\ - $(MSILIB)\ - $(SHELL32LIB) - -.IF "$(COM)"=="GCC" -STDSHL+= \ - $(KERNEL32LIB)\ - -lmsvcrt -.ELSE -STDSHL+= \ - psapi.lib -.ENDIF - -SHL1OBJS = $(SLOFILES) \ - $(SLO)$/seterror.obj - -SHL1TARGET = $(TARGET) -SHL1IMPLIB = i$(TARGET) - -SHL1DEF = $(MISC)$/$(SHL1TARGET).def -SHL1DEPN = $(SLB)$/$(TARGET).lib -SHL1BASE = 0x1c000000 -DEF1NAME=$(SHL1TARGET) -DEF1EXPORTFILE=exports.dxp - -.ENDIF - -# --- Targets -------------------------------------------------------------- - -.INCLUDE : target.mk - -# ------------------------------------------------------------------------- diff --git a/setup_native/source/win32/customactions/shellextensions/migrateinstallpath.cxx b/setup_native/source/win32/customactions/shellextensions/migrateinstallpath.cxx index 1b159fd22e79..8cf3e91dd4de 100644 --- a/setup_native/source/win32/customactions/shellextensions/migrateinstallpath.cxx +++ b/setup_native/source/win32/customactions/shellextensions/migrateinstallpath.cxx @@ -62,7 +62,7 @@ namespace } } // namespace -extern "C" UINT __stdcall MigrateInstallPath( MSIHANDLE handle ) +extern "C" __declspec(dllexport) UINT __stdcall MigrateInstallPath( MSIHANDLE handle ) { TCHAR szValue[8192]; DWORD nValueSize = sizeof(szValue); diff --git a/setup_native/source/win32/customactions/shellextensions/startmenuicon.cxx b/setup_native/source/win32/customactions/shellextensions/startmenuicon.cxx index de3f3f6b461e..188a96555ab8 100644 --- a/setup_native/source/win32/customactions/shellextensions/startmenuicon.cxx +++ b/setup_native/source/win32/customactions/shellextensions/startmenuicon.cxx @@ -63,7 +63,7 @@ std::_tstring GetMsiProperty( MSIHANDLE handle, const std::_tstring& sProperty ) Called during installation to customize the start menu folder icon. See: http://msdn.microsoft.com/library/en-us/shellcc/platform/shell/programmersguide/shell_basics/shell_basics_extending/custom.asp */ -extern "C" UINT __stdcall InstallStartmenuFolderIcon( MSIHANDLE handle ) +extern "C" __declspec(dllexport) UINT __stdcall InstallStartmenuFolderIcon( MSIHANDLE handle ) { std::_tstring sOfficeMenuFolder = GetMsiProperty( handle, TEXT("OfficeMenuFolder") ); std::_tstring sDesktopFile = sOfficeMenuFolder + TEXT("Desktop.ini"); @@ -107,7 +107,7 @@ extern "C" UINT __stdcall InstallStartmenuFolderIcon( MSIHANDLE handle ) return ERROR_SUCCESS; } -extern "C" UINT __stdcall DeinstallStartmenuFolderIcon(MSIHANDLE handle) +extern "C" __declspec(dllexport) UINT __stdcall DeinstallStartmenuFolderIcon(MSIHANDLE handle) { std::_tstring sOfficeMenuFolder = GetMsiProperty( handle, TEXT("OfficeMenuFolder") ); std::_tstring sDesktopFile = sOfficeMenuFolder + TEXT("Desktop.ini"); diff --git a/setup_native/source/win32/customactions/shellextensions/upgrade.cxx b/setup_native/source/win32/customactions/shellextensions/upgrade.cxx index 9a5496352395..a58965e99132 100644 --- a/setup_native/source/win32/customactions/shellextensions/upgrade.cxx +++ b/setup_native/source/win32/customactions/shellextensions/upgrade.cxx @@ -169,7 +169,7 @@ namespace } } // namespace -extern "C" UINT __stdcall SetProductInstallMode(MSIHANDLE handle) +extern "C" __declspec(dllexport) UINT __stdcall SetProductInstallMode(MSIHANDLE handle) { string upgradeCode = GetMsiProperty(handle, TEXT("UpgradeCode")); upgradeCode = ConvertGuid(string(upgradeCode.c_str() + 1, upgradeCode.length() - 2)); diff --git a/setup_native/source/win32/customactions/shellextensions/vistaspecial.cxx b/setup_native/source/win32/customactions/shellextensions/vistaspecial.cxx index 7011fcdf7dd7..5e01557e24eb 100644 --- a/setup_native/source/win32/customactions/shellextensions/vistaspecial.cxx +++ b/setup_native/source/win32/customactions/shellextensions/vistaspecial.cxx @@ -141,7 +141,7 @@ static BOOL RemoveCompleteDirectory( std::_tstring sPath ) -extern "C" UINT __stdcall RenamePrgFolder( MSIHANDLE handle ) +extern "C" __declspec(dllexport) UINT __stdcall RenamePrgFolder( MSIHANDLE handle ) { std::_tstring sOfficeInstallPath = GetMsiProperty(handle, TEXT("INSTALLLOCATION")); @@ -165,7 +165,7 @@ extern "C" UINT __stdcall RenamePrgFolder( MSIHANDLE handle ) return ERROR_SUCCESS; } -extern "C" UINT __stdcall RemovePrgFolder( MSIHANDLE handle ) +extern "C" __declspec(dllexport) UINT __stdcall RemovePrgFolder( MSIHANDLE handle ) { std::_tstring sOfficeInstallPath = GetMsiProperty(handle, TEXT("INSTALLLOCATION")); std::_tstring sRemoveDir = sOfficeInstallPath + TEXT("program_old"); diff --git a/setup_native/source/win32/customactions/thesaurus/exports.dxp b/setup_native/source/win32/customactions/thesaurus/exports.dxp deleted file mode 100644 index 830adddb3166..000000000000 --- a/setup_native/source/win32/customactions/thesaurus/exports.dxp +++ /dev/null @@ -1 +0,0 @@ -CreateIndexes diff --git a/setup_native/source/win32/customactions/thesaurus/makefile.mk b/setup_native/source/win32/customactions/thesaurus/makefile.mk deleted file mode 100644 index 115b70e1fa32..000000000000 --- a/setup_native/source/win32/customactions/thesaurus/makefile.mk +++ /dev/null @@ -1,66 +0,0 @@ -# -# 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 . -# - -PRJ=..$/..$/..$/.. -PRJNAME=setup_native -TARGET=thidxmsi - -# --- Settings ----------------------------------------------------- - -ENABLE_EXCEPTIONS=TRUE -NO_DEFAULT_STL=TRUE -DYNAMIC_CRT= -USE_DEFFILE=TRUE - -.INCLUDE : settings.mk - -.IF "$(OS)"=="WNT" && "$(WINDOWS_SDK_HOME)"!="" - -CFLAGS+=-D_STLP_USE_STATIC_LIB - -# --- Files -------------------------------------------------------- - -UWINAPILIB= - -SLOFILES = \ - $(SLO)$/thesaurus.obj - -SHL1STDLIBS= kernel32.lib\ - user32.lib\ - advapi32.lib\ - shell32.lib\ - msi.lib - -SHL1LIBS = $(SLB)$/$(TARGET).lib - -SHL1TARGET = $(TARGET) -SHL1IMPLIB = i$(TARGET) - -SHL1DEF = $(MISC)$/$(SHL1TARGET).def -SHL1DEPN = $(SLB)$/$(TARGET).lib -SHL1BASE = 0x1c000000 -DEF1NAME=$(SHL1TARGET) -DEF1EXPORTFILE=exports.dxp - -.ENDIF - -# --- Targets -------------------------------------------------------------- - -.INCLUDE : target.mk - -# ------------------------------------------------------------------------- diff --git a/setup_native/source/win32/customactions/thesaurus/thesaurus.cxx b/setup_native/source/win32/customactions/thesaurus/thesaurus.cxx index 349ed75d8faf..b5c4aec310af 100644 --- a/setup_native/source/win32/customactions/thesaurus/thesaurus.cxx +++ b/setup_native/source/win32/customactions/thesaurus/thesaurus.cxx @@ -190,7 +190,7 @@ namespace // Creates the thesaurus .idx files for all installed .dat // thesaurus files -extern "C" UINT __stdcall CreateIndexes( MSIHANDLE handle ) +extern "C" __declspec(dllexport) UINT __stdcall CreateIndexes( MSIHANDLE handle ) { string sOfficeInstallPath = GetMsiProperty(handle, TEXT("INSTALLLOCATION")); diff --git a/setup_native/source/win32/customactions/tools/checkversion.cxx b/setup_native/source/win32/customactions/tools/checkversion.cxx index dc42bfa63288..d6fe1a0715a6 100644 --- a/setup_native/source/win32/customactions/tools/checkversion.cxx +++ b/setup_native/source/win32/customactions/tools/checkversion.cxx @@ -72,7 +72,7 @@ static inline void OutputDebugStringFormat( LPCTSTR, ... ) #endif //---------------------------------------------------------- -extern "C" UINT __stdcall CheckVersions( MSIHANDLE hMSI ) +extern "C" __declspec(dllexport) UINT __stdcall CheckVersions( MSIHANDLE hMSI ) { // MessageBox(NULL, L"CheckVersions", L"Information", MB_OK | MB_ICONINFORMATION); diff --git a/setup_native/source/win32/customactions/tools/exports.dxp b/setup_native/source/win32/customactions/tools/exports.dxp deleted file mode 100644 index 18d82240f49e..000000000000 --- a/setup_native/source/win32/customactions/tools/exports.dxp +++ /dev/null @@ -1 +0,0 @@ -CheckVersions diff --git a/setup_native/source/win32/customactions/tools/makefile.mk b/setup_native/source/win32/customactions/tools/makefile.mk deleted file mode 100644 index daae3181103e..000000000000 --- a/setup_native/source/win32/customactions/tools/makefile.mk +++ /dev/null @@ -1,63 +0,0 @@ -# -# 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 . -# - -PRJ=..$/..$/..$/.. -PRJNAME=setup_native -TARGET=sn_tools - - -# --- Settings ----------------------------------------------------- - -ENABLE_EXCEPTIONS=TRUE -NO_DEFAULT_STL=TRUE -DYNAMIC_CRT= -USE_DEFFILE=TRUE - -.INCLUDE : settings.mk - -# --- Files -------------------------------------------------------- - -.IF "$(OS)"=="WNT" && "$(WINDOWS_SDK_HOME)"!="" - -UWINAPILIB= - -SLOFILES = $(SLO)$/seterror.obj \ - $(SLO)$/checkversion.obj - -SHL1OBJS = $(SLOFILES) - -STDSHL+= \ - $(ADVAPI32LIB)\ - $(MSILIB) - -SHL1TARGET = $(TARGET) -SHL1IMPLIB = i$(TARGET) - -SHL1DEF = $(MISC)$/$(SHL1TARGET).def -SHL1DEPN = $(SLB)$/$(TARGET).lib -SHL1BASE = 0x1c000000 -DEF1NAME=$(SHL1TARGET) -DEF1EXPORTFILE=exports.dxp - -.ENDIF - -# --- Targets -------------------------------------------------------------- - -.INCLUDE : target.mk - -# ------------------------------------------------------------------------- diff --git a/setup_native/source/win32/wintools/makecab/makefile.mk b/setup_native/source/win32/wintools/makecab/makefile.mk deleted file mode 100644 index 63604c3748ef..000000000000 --- a/setup_native/source/win32/wintools/makecab/makefile.mk +++ /dev/null @@ -1,35 +0,0 @@ -# -# 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/. -# - -PRJ=..$/..$/..$/.. -PRJNAME=setup_native -TARGET=sn_makecab - - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -# --- Files -------------------------------------------------------- - -.IF "$(WINEGCC)"=="" -@all: - @echo "No winegcc present, not building makecab..." -.ELSE -@all: $(BIN)/makecab.exe $(BIN)/makecab.exe.so - -$(BIN)/makecab.exe.so: $(BIN)/makecab.exe - -$(BIN)/makecab.exe: - $(WINEGCC) -o $(BIN)/makecab.exe makecab.c parseddf.c -m32 -mconsole -lmsi - -# --- Targets -------------------------------------------------------------- - -.INCLUDE : target.mk - -.ENDIF diff --git a/setup_native/source/win32/wintools/msidb/makefile.mk b/setup_native/source/win32/wintools/msidb/makefile.mk deleted file mode 100644 index 849f615c33ca..000000000000 --- a/setup_native/source/win32/wintools/msidb/makefile.mk +++ /dev/null @@ -1,36 +0,0 @@ -# -# 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/. -# - -PRJ=..$/..$/..$/.. -PRJNAME=setup_native -TARGET=sn_msidb - - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -# --- Files -------------------------------------------------------- - -.IF "$(WINEGCC)"=="" -@all: - @echo "No winegcc present, not building msidb..." -.ELSE -@all: $(BIN)/msidb.exe $(BIN)/msidb.exe.so - -$(BIN)/msidb.exe.so: $(BIN)/msidb.exe - -$(BIN)/msidb.exe: - $(WINEGCC) -o $(BIN)/msidb.exe msidb.c -m32 -municode -lmsi - -# --- Targets -------------------------------------------------------------- - -.INCLUDE : target.mk - -# ------------------------------------------------------------------------- -.ENDIF diff --git a/setup_native/source/win32/wintools/msiinfo/makefile.mk b/setup_native/source/win32/wintools/msiinfo/makefile.mk deleted file mode 100644 index 58d986e8f00b..000000000000 --- a/setup_native/source/win32/wintools/msiinfo/makefile.mk +++ /dev/null @@ -1,35 +0,0 @@ -# -# 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/. -# - -PRJ=..$/..$/..$/.. -PRJNAME=setup_native -TARGET=sn_msiinfo - - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -# --- Files -------------------------------------------------------- - -.IF "$(WINEGCC)"=="" -@all: - @echo "No winegcc present, not building msiinfo..." -.ELSE -@all: $(BIN)/msiinfo.exe $(BIN)/msiinfo.exe.so - -$(BIN)/msiinfo.exe.so: $(BIN)/msiinfo.exe - -$(BIN)/msiinfo.exe: - $(WINEGCC) -o $(BIN)/msiinfo.exe msiinfo.c -m32 -mconsole -municode -lmsi - -# --- Targets -------------------------------------------------------------- - -.INCLUDE : target.mk - -.ENDIF diff --git a/setup_native/source/win32/wintools/msimsp/makefile.mk b/setup_native/source/win32/wintools/msimsp/makefile.mk deleted file mode 100644 index 0aabdf3d748b..000000000000 --- a/setup_native/source/win32/wintools/msimsp/makefile.mk +++ /dev/null @@ -1,35 +0,0 @@ -# -# 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/. -# - -PRJ=..$/..$/..$/.. -PRJNAME=setup_native -TARGET=sn_msimsp - - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -# --- Files -------------------------------------------------------- - -.IF "$(WINEGCC)"=="" -@all: - @echo "No winegcc present, not building msimsp..." -.ELSE -@all: $(BIN)/msimsp.exe $(BIN)/msimsp.exe.so - -$(BIN)/msimsp.exe.so: $(BIN)/msimsp.exe - -$(BIN)/msimsp.exe: - $(WINEGCC) -o $(BIN)/msimsp.exe msimsp.c -m32 -mconsole -lmsi - -# --- Targets -------------------------------------------------------------- - -.INCLUDE : target.mk - -.ENDIF diff --git a/setup_native/source/win32/wintools/msitran/makefile.mk b/setup_native/source/win32/wintools/msitran/makefile.mk deleted file mode 100644 index f5a1dd4db176..000000000000 --- a/setup_native/source/win32/wintools/msitran/makefile.mk +++ /dev/null @@ -1,35 +0,0 @@ -# -# 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/. -# - -PRJ=..$/..$/..$/.. -PRJNAME=setup_native -TARGET=sn_msitran - - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -# --- Files -------------------------------------------------------- - -.IF "$(WINEGCC)"=="" -@all: - @echo "No winegcc present, not building msitran..." -.ELSE -@all: $(BIN)/msitran.exe $(BIN)/msitran.exe.so - -$(BIN)/msitran.exe.so: $(BIN)/msitran.exe - -$(BIN)/msitran.exe: - $(WINEGCC) -o $(BIN)/msitran.exe msitran.c -m32 -mconsole -lmsi - -# --- Targets -------------------------------------------------------------- - -.INCLUDE : target.mk - -.ENDIF |