- create plugin.lib that contains all

- distribute plugin.h, api.h and plugin.lib
- remove inc_c stuff because we don't really want to install win32 header files as something that can be used on linux (this should be revisited later)
- fix up MakeFileList for newer versions of SCons (should be removed in the future)

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@5826 212acab6-be3b-0410-9dea-997c60f758d6

Contrib/ExDLL/SConscript

@@ -1,7 +1,15 @@
 # FIXME: install assembly and pascal includes into the correct locations
 
-c_devel = Split("""
-	exdll.h
+lib_target = "plugin"
+
+lib_files = Split("""
+	plugin.c
+""")
+
+api_files = Split("""
+	plugin.h
+	plugin.lib
+	#Source/exehead/api.h
 """)
 
 example = Split("""
@@ -14,12 +22,19 @@ example = Split("""
 	extdll.inc
 """)
 
-Import('defenv')
+Import('env plugin_env')
 
-if defenv['PLATFORM'] == 'win32':
-	example += c_devel
-else:
-	defenv.DistributeIncC(c_devel)
+# build library
 
-defenv.DistributeExamples(example, path='Plugin')
+api_env = env.Clone()
+api_env.Append(CPPPATH = ['#Source/exehead'])
+lib = api_env.Library(lib_target, lib_files)
 
+# distribute library, files and examples
+
+env.DistributeExamples(example + api_files + lib, path='Plugin')
+
+# make sure all the other plug-ins can use the library
+
+plugin_env.Append(LIBPATH = [lib[0].dir])
+plugin_env.Append(LIBS = [lib_target])

Contrib/ExDLL/plugin.c

@@ -0,0 +1,41 @@
+#include <windows.h>
+
+#include "plugin.h"
+
+unsigned int g_stringsize;
+stack_t **g_stacktop;
+char *g_variables;
+
+// utility functions (not required but often useful)
+int NSISCALL popstring(char *str)
+{
+  stack_t *th;
+  if (!g_stacktop || !*g_stacktop) return 1;
+  th=(*g_stacktop);
+  lstrcpyA(str,th->text);
+  *g_stacktop = th->next;
+  GlobalFree((HGLOBAL)th);
+  return 0;
+}
+
+void NSISCALL pushstring(const char *str)
+{
+  stack_t *th;
+  if (!g_stacktop) return;
+  th=(stack_t*)GlobalAlloc(GPTR,sizeof(stack_t)+g_stringsize);
+  lstrcpynA(th->text,str,g_stringsize);
+  th->next=*g_stacktop;
+  *g_stacktop=th;
+}
+
+char * NSISCALL getuservariable(const int varnum)
+{
+  if (varnum < 0 || varnum >= __INST_LAST) return NULL;
+  return g_variables+varnum*g_stringsize;
+}
+
+void NSISCALL setuservariable(const int varnum, const char *var)
+{
+	if (var != NULL && varnum >= 0 && varnum < __INST_LAST) 
+		lstrcpyA(g_variables + varnum*g_stringsize, var);
+}

Contrib/ExDLL/plugin.h

@@ -0,0 +1,59 @@
+#ifndef ___NSIS_PLUGIN__H___
+#define ___NSIS_PLUGIN__H___
+
+#include "api.h"
+
+#ifndef NSISCALL
+#  define NSISCALL __stdcall
+#endif
+
+#define EXDLL_INIT()           {  \
+        g_stringsize=string_size; \
+        g_stacktop=stacktop;      \
+        g_variables=variables; }
+
+typedef struct _stack_t {
+  struct _stack_t *next;
+  char text[1]; // this should be the length of string_size
+} stack_t;
+
+enum
+{
+INST_0,         // $0
+INST_1,         // $1
+INST_2,         // $2
+INST_3,         // $3
+INST_4,         // $4
+INST_5,         // $5
+INST_6,         // $6
+INST_7,         // $7
+INST_8,         // $8
+INST_9,         // $9
+INST_R0,        // $R0
+INST_R1,        // $R1
+INST_R2,        // $R2
+INST_R3,        // $R3
+INST_R4,        // $R4
+INST_R5,        // $R5
+INST_R6,        // $R6
+INST_R7,        // $R7
+INST_R8,        // $R8
+INST_R9,        // $R9
+INST_CMDLINE,   // $CMDLINE
+INST_INSTDIR,   // $INSTDIR
+INST_OUTDIR,    // $OUTDIR
+INST_EXEDIR,    // $EXEDIR
+INST_LANG,      // $LANGUAGE
+__INST_LAST
+};
+
+extern unsigned int g_stringsize;
+extern stack_t **g_stacktop;
+extern char *g_variables;
+
+int NSISCALL popstring(char *str); // 0 on success, 1 on empty stack
+void NSISCALL pushstring(const char *str);
+char * NSISCALL getuservariable(const int varnum);
+void NSISCALL setuservariable(const int varnum, const char *var);
+
+#endif//!___NSIS_PLUGIN__H___