From eff14a4702c5377644ca4dd443d76c7fd154156c Mon Sep 17 00:00:00 2001 From: pabs3 Date: Wed, 4 Feb 2009 14:08:31 +0000 Subject: [PATCH] Install the pluginapi stuff in a subdirectory. git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@5922 212acab6-be3b-0410-9dea-997c60f758d6 --- Contrib/AdvSplash/advsplash.c | 2 +- Contrib/Banner/Banner.c | 2 +- Contrib/BgImage/BgImage.cpp | 2 +- Contrib/Dialer/dialer.c | 2 +- Contrib/ExDLL/SConscript | 12 ++++++------ Contrib/ExDLL/exdll.c | 2 +- Contrib/ExDLL/exdll.h | 2 +- Contrib/InstallOptions/InstallerOptions.cpp | 2 +- Contrib/LangDLL/LangDLL.c | 2 +- Contrib/Library/TypeLib/TypeLib.cpp | 2 +- Contrib/Math/Source/Math.c | 2 +- Contrib/Math/Source/Math.h | 2 +- Contrib/NSISdl/nsisdl.cpp | 2 +- Contrib/Splash/splash.c | 2 +- Contrib/StartMenu/StartMenu.c | 2 +- Contrib/System/Source/Plugin.h | 2 +- Contrib/UserInfo/UserInfo.c | 2 +- Contrib/VPatch/Source/Plugin/vpatchdll.c | 2 +- Contrib/nsDialogs/browse.c | 2 +- Contrib/nsDialogs/input.c | 2 +- Contrib/nsDialogs/nsDialogs.c | 2 +- Contrib/nsDialogs/rtl.c | 2 +- Contrib/nsExec/nsexec.c | 2 +- INSTALL | 3 ++- 24 files changed, 30 insertions(+), 29 deletions(-) diff --git a/Contrib/AdvSplash/advsplash.c b/Contrib/AdvSplash/advsplash.c index f8f92618..bdf8acfc 100644 --- a/Contrib/AdvSplash/advsplash.c +++ b/Contrib/AdvSplash/advsplash.c @@ -3,7 +3,7 @@ #include #include -#include // nsis plugin +#include // nsis plugin HINSTANCE g_hInstance; diff --git a/Contrib/Banner/Banner.c b/Contrib/Banner/Banner.c index 954e94ad..018cd447 100644 --- a/Contrib/Banner/Banner.c +++ b/Contrib/Banner/Banner.c @@ -1,5 +1,5 @@ #include -#include // nsis plugin +#include // nsis plugin #include "../../Source/exehead/resource.h" // Turn a pair of chars into a word diff --git a/Contrib/BgImage/BgImage.cpp b/Contrib/BgImage/BgImage.cpp index b411266c..4a3fc7d0 100644 --- a/Contrib/BgImage/BgImage.cpp +++ b/Contrib/BgImage/BgImage.cpp @@ -1,6 +1,6 @@ #include #include -#include // nsis plugin +#include // nsis plugin #undef EXDLL_INIT diff --git a/Contrib/Dialer/dialer.c b/Contrib/Dialer/dialer.c index c6c7067c..c78ac4b5 100644 --- a/Contrib/Dialer/dialer.c +++ b/Contrib/Dialer/dialer.c @@ -2,7 +2,7 @@ #include #include -#include // nsis plugin +#include // nsis plugin #define NSISFunction(funcname) void __declspec(dllexport) funcname(HWND hwndParent, int string_size, char *variables, stack_t **stacktop, extra_parameters *extra) diff --git a/Contrib/ExDLL/SConscript b/Contrib/ExDLL/SConscript index dd7863fc..3d2beaf4 100644 --- a/Contrib/ExDLL/SConscript +++ b/Contrib/ExDLL/SConscript @@ -33,26 +33,26 @@ lib = api_env.Library(lib_target, lib_files) # distribute library, files and examples -example += api_files +env.DistributeExamples(api_files, path='Plugin/nsis') if env['PLATFORM'] == 'win32': - example += lib + env.DistributeExamples(lib, path='Plugin/nsis') else: example += lib_files if env.has_key('PREFIX_PLUGINAPI_INC'): - env.Distribute(api_files, None, 'pluginapi_inc', '', '', 'pluginapi', 'pluginapi') + env.Distribute(api_files, None, 'pluginapi_inc', '', 'nsis', 'pluginapi', 'pluginapi') if env.has_key('PREFIX_PLUGINAPI_LIB'): - env.Distribute(lib, None, 'pluginapi_lib', '', '', 'pluginapi', 'pluginapi') + env.Distribute(lib, None, 'pluginapi_lib', '', 'nsis', 'pluginapi', 'pluginapi') env.DistributeExamples(example, path='Plugin') # make sure all the other plug-ins can use the library -env.Install('#$BUILD_PREFIX/api', api_files + lib) +env.Install('#$BUILD_PREFIX/api/nsis', api_files + lib) plugin_env.Append(CPPPATH = ['#$BUILD_PREFIX/api']) -plugin_env.Append(LIBPATH = ['#$BUILD_PREFIX/api']) +plugin_env.Append(LIBPATH = ['#$BUILD_PREFIX/api/nsis']) plugin_env.Append(LIBS = [lib_target]) diff --git a/Contrib/ExDLL/exdll.c b/Contrib/ExDLL/exdll.c index 6c6a2cf1..6e5c1ac7 100644 --- a/Contrib/ExDLL/exdll.c +++ b/Contrib/ExDLL/exdll.c @@ -1,5 +1,5 @@ #include -#include // nsis plugin +#include // nsis plugin HINSTANCE g_hInstance; diff --git a/Contrib/ExDLL/exdll.h b/Contrib/ExDLL/exdll.h index 258f38f9..3a9fe5aa 100644 --- a/Contrib/ExDLL/exdll.h +++ b/Contrib/ExDLL/exdll.h @@ -5,7 +5,7 @@ #define _EXDLL_H_ #include -#include // nsis plugin +#include // nsis plugin // this may not work if /NODEFAULTLIB is used #ifdef _MSC_VER diff --git a/Contrib/InstallOptions/InstallerOptions.cpp b/Contrib/InstallOptions/InstallerOptions.cpp index ab7e73ec..d8303b06 100644 --- a/Contrib/InstallOptions/InstallerOptions.cpp +++ b/Contrib/InstallOptions/InstallerOptions.cpp @@ -14,7 +14,7 @@ #include "resource.h" #include "shellapi.h" -#include // nsis plugin +#include // nsis plugin // Use for functions only called from one place to possibly reduce some code // size. Allows the source code to remain readable by leaving the function diff --git a/Contrib/LangDLL/LangDLL.c b/Contrib/LangDLL/LangDLL.c index 321e81d2..537e3ad2 100644 --- a/Contrib/LangDLL/LangDLL.c +++ b/Contrib/LangDLL/LangDLL.c @@ -10,7 +10,7 @@ // LangDLL:LangDialog "Language Selection" "Choose a language" 2F French 1036 English 1033 12 Garamond -#include // nsis plugin +#include // nsis plugin HINSTANCE g_hInstance; HWND g_hwndParent; diff --git a/Contrib/Library/TypeLib/TypeLib.cpp b/Contrib/Library/TypeLib/TypeLib.cpp index 2726357e..97379e70 100644 --- a/Contrib/Library/TypeLib/TypeLib.cpp +++ b/Contrib/Library/TypeLib/TypeLib.cpp @@ -6,7 +6,7 @@ */ #include -#include // nsis plugin +#include // nsis plugin #define NSISFunction(funcname) extern "C" void __declspec(dllexport) funcname(HWND hwndParent, int string_size, char *variables, stack_t **stacktop) diff --git a/Contrib/Math/Source/Math.c b/Contrib/Math/Source/Math.c index 275d0ae2..6737a822 100644 --- a/Contrib/Math/Source/Math.c +++ b/Contrib/Math/Source/Math.c @@ -1,5 +1,5 @@ #include -#include // nsis plugin +#include // nsis plugin #include "MyMath.h" #include "Math.h" diff --git a/Contrib/Math/Source/Math.h b/Contrib/Math/Source/Math.h index 165161a0..1dad1801 100644 --- a/Contrib/Math/Source/Math.h +++ b/Contrib/Math/Source/Math.h @@ -1,6 +1,6 @@ #pragma once -#include // nsis plugin +#include // nsis plugin #ifdef _DEBUG //#define _DEBUG_LEAKS diff --git a/Contrib/NSISdl/nsisdl.cpp b/Contrib/NSISdl/nsisdl.cpp index f3e6ae93..7eaa246a 100644 --- a/Contrib/NSISdl/nsisdl.cpp +++ b/Contrib/NSISdl/nsisdl.cpp @@ -26,7 +26,7 @@ #include "util.h" #include "httpget.h" -#include // nsis plugin +#include // nsis plugin void *operator new( unsigned int num_bytes ) { diff --git a/Contrib/Splash/splash.c b/Contrib/Splash/splash.c index c72978ab..efc36fc9 100644 --- a/Contrib/Splash/splash.c +++ b/Contrib/Splash/splash.c @@ -1,5 +1,5 @@ #include -#include // nsis plugin +#include // nsis plugin HINSTANCE g_hInstance; diff --git a/Contrib/StartMenu/StartMenu.c b/Contrib/StartMenu/StartMenu.c index 691d99f5..d3f916b8 100644 --- a/Contrib/StartMenu/StartMenu.c +++ b/Contrib/StartMenu/StartMenu.c @@ -1,6 +1,6 @@ #include #include -#include // nsis plugin +#include // nsis plugin #include "resource.h" HINSTANCE g_hInstance; diff --git a/Contrib/System/Source/Plugin.h b/Contrib/System/Source/Plugin.h index 7dee9df8..a448ab89 100644 --- a/Contrib/System/Source/Plugin.h +++ b/Contrib/System/Source/Plugin.h @@ -1,7 +1,7 @@ #ifndef ___PLUGIN__H___ #define ___PLUGIN__H___ -#include // nsis plugin +#include // nsis plugin #define PLUGINFUNCTION(name) \ void __declspec(dllexport) name( \ diff --git a/Contrib/UserInfo/UserInfo.c b/Contrib/UserInfo/UserInfo.c index abaf639e..1706d766 100644 --- a/Contrib/UserInfo/UserInfo.c +++ b/Contrib/UserInfo/UserInfo.c @@ -1,5 +1,5 @@ #include -#include // nsis plugin +#include // nsis plugin typedef BOOL (WINAPI*CHECKTOKENMEMBERSHIP)(HANDLE TokenHandle,PSID SidToCheck,PBOOL IsMember); CHECKTOKENMEMBERSHIP _CheckTokenMembership=NULL; diff --git a/Contrib/VPatch/Source/Plugin/vpatchdll.c b/Contrib/VPatch/Source/Plugin/vpatchdll.c index 726b1ece..df6ca613 100644 --- a/Contrib/VPatch/Source/Plugin/vpatchdll.c +++ b/Contrib/VPatch/Source/Plugin/vpatchdll.c @@ -25,7 +25,7 @@ #define WIN32_LEAN_AND_MEAN #include -#include // nsis plugin +#include // nsis plugin #include "apply_patch.h" #include "checksum.h" diff --git a/Contrib/nsDialogs/browse.c b/Contrib/nsDialogs/browse.c index f16885cf..9a7d637b 100644 --- a/Contrib/nsDialogs/browse.c +++ b/Contrib/nsDialogs/browse.c @@ -1,7 +1,7 @@ #include #include -#include // nsis plugin +#include // nsis plugin #include "defs.h" diff --git a/Contrib/nsDialogs/input.c b/Contrib/nsDialogs/input.c index abf52841..cf869f82 100644 --- a/Contrib/nsDialogs/input.c +++ b/Contrib/nsDialogs/input.c @@ -1,6 +1,6 @@ #include -#include // nsis plugin +#include // nsis plugin #include "input.h" #include "defs.h" diff --git a/Contrib/nsDialogs/nsDialogs.c b/Contrib/nsDialogs/nsDialogs.c index 755783e6..850a8e51 100644 --- a/Contrib/nsDialogs/nsDialogs.c +++ b/Contrib/nsDialogs/nsDialogs.c @@ -1,6 +1,6 @@ #include -#include // nsis plugin +#include // nsis plugin #include "defs.h" #include "input.h" diff --git a/Contrib/nsDialogs/rtl.c b/Contrib/nsDialogs/rtl.c index 6dda123b..72f9a07d 100644 --- a/Contrib/nsDialogs/rtl.c +++ b/Contrib/nsDialogs/rtl.c @@ -1,7 +1,7 @@ #include #include -#include // nsis plugin +#include // nsis plugin #include "defs.h" diff --git a/Contrib/nsExec/nsexec.c b/Contrib/nsExec/nsexec.c index f4c60e7b..a3d784fe 100644 --- a/Contrib/nsExec/nsexec.c +++ b/Contrib/nsExec/nsexec.c @@ -21,7 +21,7 @@ freely, subject to the following restrictions: #include #include #include -#include // nsis plugin +#include // nsis plugin #ifndef true #define true TRUE diff --git a/INSTALL b/INSTALL index 9191137e..df1b2881 100644 --- a/INSTALL +++ b/INSTALL @@ -63,7 +63,8 @@ This is a trimmed version of Appendix "Building NSIS" of the documentation. PREFIX_DATA: Where to put the plugins, stubs, etc. Defaults to $PREFIX/share/nsis/ PREFIX_DOC: Where to put the docs and examples. Defaults to $PREFIX/share/doc/nsis/ PREFIX_DEST: The install root Useful for packagers. Defaults to the root directory. - PREFIX_INC_C: Where to put the C headers. Defaults to $PREFIX/include/nsis/ + PREFIX_PLUGINAPI_INC: Where to put the plugin api headers. Defaults to not installed. + PREFIX_PLUGINAPI_LIB: Where to put the plugin api static lib. Defaults to not installed. - Problems