diff options
| author | Peter Foley <pefoley2@verizon.net> | 2013-02-07 19:17:22 -0500 |
|---|---|---|
| committer | David Ostrovsky <David.Ostrovsky@gmx.de> | 2013-02-09 20:41:19 +0000 |
| commit | 4261757fc6dd17811296842cc16f507be400652e (patch) | |
| tree | 429ea17bb0b1d2e7afcbca5c6cb81972dc22b962 /setup_native/source | |
| parent | 803137f4715ee7ab127a9718ca213db252193398 (diff) | |
convert setup_native to gbuild and add to tail_build
Change-Id: Ie12338dada22c59d55d89ed9611bb1a958b04223
Reviewed-on: https://gerrit.libreoffice.org/2063
Reviewed-by: David Ostrovsky <David.Ostrovsky@gmx.de>
Tested-by: David Ostrovsky <David.Ostrovsky@gmx.de>
Diffstat (limited to 'setup_native/source')
49 files changed, 28 insertions, 999 deletions
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/packinfo/makefile.mk b/setup_native/source/packinfo/makefile.mk deleted file mode 100644 index a2c647886cf2..000000000000 --- a/setup_native/source/packinfo/makefile.mk +++ /dev/null @@ -1,24 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# - -PRJ = ../.. -PRJNAME = setup_native -TARGET = packinfo - -.INCLUDE: settings.mk - -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 >$@ - -# vim: set noet sw=4 ts=4: 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 |