add support for Perl 5.14

7 files changed, 48 insertions, 0 deletions

diff --git a/build/build-x64.bat b/build/build-x64.bat
index 6f49dae2..5375809e 100644
--- a/build/build-x64.bat
+++ b/build/build-x64.bat
@@ -1,6 +1,7 @@
 @echo off
 set PERL_510=c:\mozilla-build\perl-5.10-x64
 set PERL_512=c:\mozilla-build\perl-5.12-x64
+set PERL_514=c:\mozilla-build\perl-5.14-x64
 cd ..
 set DEV_64=%cd%\dep-x64
 cd src
@@ -30,6 +31,9 @@ nmake /nologo /s /f makefile-510.mak
 set PATH=%OOPATH%;%PERL_512%\bin
 nmake /nologo /s /f makefile-512.mak clean
 nmake /nologo /s /f makefile-512.mak
+set PATH=%OOPATH%;%PERL_514%\bin
+nmake /nologo /s /f makefile-514.mak clean
+nmake /nologo /s /f makefile-514.mak
 cd ..\..\build
 set PATH=%OPATH%
 call release-x64.bat
diff --git a/build/build-x86.bat b/build/build-x86.bat
index 7776ee4d..b8ee8052 100644
--- a/build/build-x86.bat
+++ b/build/build-x86.bat
@@ -1,6 +1,7 @@
 @echo off
 set PERL_510=c:\mozilla-build\perl-5.10-x86
 set PERL_512=c:\mozilla-build\perl-5.12-x86
+set PERL_514=c:\mozilla-build\perl-5.14-x86
 echo [Setup] > xchat-wdk.iss
 echo WizardImageFile=%cd%\bitmaps\wizardimage.bmp >> xchat-wdk.iss
 echo WizardSmallImageFile=%cd%\bitmaps\wizardsmallimage.bmp >> xchat-wdk.iss
@@ -31,6 +32,9 @@ nmake /nologo /s /f makefile-510.mak
 set PATH=%OOPATH%;%PERL_512%\bin
 nmake /nologo /s /f makefile-512.mak clean
 nmake /nologo /s /f makefile-512.mak
+set PATH=%OOPATH%;%PERL_514%\bin
+nmake /nologo /s /f makefile-514.mak clean
+nmake /nologo /s /f makefile-514.mak
 cd ..\..\build
 call compile-po-files.bat
 set PATH=%OPATH%
diff --git a/build/release-x64.bat b/build/release-x64.bat
index ddb070b6..50ae1e64 100644
--- a/build/release-x64.bat
+++ b/build/release-x64.bat
@@ -36,6 +36,7 @@ copy ..\plugins\lua\xclua.dll %XCHAT_DEST%\plugins\xclua.dll.x64
 copy ..\plugins\mpcinfo\xcmpcinfo.dll %XCHAT_DEST%\plugins\xcmpcinfo.dll.x64
 copy ..\plugins\perl\xcperl-510.dll %XCHAT_DEST%\plugins\xcperl-510.dll.x64
 copy ..\plugins\perl\xcperl-512.dll %XCHAT_DEST%\plugins\xcperl-512.dll.x64
+copy ..\plugins\perl\xcperl-514.dll %XCHAT_DEST%\plugins\xcperl-514.dll.x64
 copy ..\plugins\python\xcpython.dll %XCHAT_DEST%\plugins\xcpython.dll.x64
 copy ..\plugins\tcl\xctcl.dll %XCHAT_DEST%\plugins\xctcl.dll.x64
 copy ..\plugins\upd\xcupd.dll %XCHAT_DEST%\plugins\xcupd.dll.x64
diff --git a/build/release-x86.bat b/build/release-x86.bat
index c33e981c..05ad7df5 100644
--- a/build/release-x86.bat
+++ b/build/release-x86.bat
@@ -48,6 +48,7 @@ copy ..\plugins\lua\xclua.dll %XCHAT_DEST%\plugins
 copy ..\plugins\mpcinfo\xcmpcinfo.dll %XCHAT_DEST%\plugins
 copy ..\plugins\perl\xcperl-510.dll %XCHAT_DEST%\plugins
 copy ..\plugins\perl\xcperl-512.dll %XCHAT_DEST%\plugins
+copy ..\plugins\perl\xcperl-514.dll %XCHAT_DEST%\plugins
 copy ..\plugins\python\xcpython.dll %XCHAT_DEST%\plugins
 copy ..\plugins\tcl\xctcl.dll %XCHAT_DEST%\plugins
 copy ..\plugins\upd\xcupd.dll %XCHAT_DEST%\plugins
diff --git a/build/xchat-wdk.skel.iss b/build/xchat-wdk.skel.iss
index 86b9904a..dccd58ff 100644
--- a/build/xchat-wdk.skel.iss
+++ b/build/xchat-wdk.skel.iss
@@ -57,6 +57,7 @@ Name: x64; Description: "x64"; GroupDescription: "XChat-WDK version:"; Flags: ex
 

 Name: perl510; Description: "5.10"; GroupDescription: "Perl version:"; Flags: exclusive unchecked; Components: langs\perl

 Name: perl512; Description: "5.12"; GroupDescription: "Perl version:"; Flags: exclusive; Components: langs\perl

+Name: perl514; Description: "5.14"; GroupDescription: "Perl version:"; Flags: exclusive; Components: langs\perl

 

 Name: portable; Description: "Yes"; GroupDescription: "Portable Install (no Registry entries, no Start Menu icons, no uninstaller):"; Flags: unchecked

 

@@ -228,6 +229,9 @@ Source: "plugins\xcperl-510.dll.x64"; DestDir: "{app}\plugins"; DestName: "xcper
 Source: "plugins\xcperl-512.dll"; DestDir: "{app}\plugins"; DestName: "xcperl.dll"; Components: langs\perl; Tasks: x86 and perl512

 Source: "plugins\xcperl-512.dll.x64"; DestDir: "{app}\plugins"; DestName: "xcperl.dll"; Components: langs\perl; Tasks: x64 and perl512

 

+Source: "plugins\xcperl-514.dll"; DestDir: "{app}\plugins"; DestName: "xcperl.dll"; Components: langs\perl; Tasks: x86 and perl514

+Source: "plugins\xcperl-514.dll.x64"; DestDir: "{app}\plugins"; DestName: "xcperl.dll"; Components: langs\perl; Tasks: x64 and perl514

+

 [Icons]

 Name: "{group}\XChat-WDK"; Filename: "{app}\xchat.exe"; Tasks: not portable

 Name: "{group}\XChat-Text"; Filename: "{app}\xchat-text.exe"; Components: xctext; Tasks: not portable

diff --git a/plugins/perl/makefile-514.mak b/plugins/perl/makefile-514.mak
new file mode 100644
index 00000000..94ee456f
--- /dev/null
+++ b/plugins/perl/makefile-514.mak
@@ -0,0 +1,30 @@
+include "..\..\src\makeinc.mak"
+
+DIRENTLIB = ..\..\src\common\dirent.lib
+TARGET = $(PERL514OUTPUT)
+
+all: $(TARGET)
+
+perl.def:
+	echo EXPORTS > perl.def
+	echo xchat_plugin_init >> perl.def
+	echo xchat_plugin_deinit >> perl.def
+	echo xchat_plugin_get_info >> perl.def
+
+perl.obj: perl.c
+	$(CC) $(CFLAGS) perl.c $(GLIB) /I$(PERL514PATH) /I.. /DPERL_DLL=\"$(PERL514LIB).dll\"
+
+perl.c: xchat.pm.h
+
+xchat.pm.h: lib/Xchat.pm lib/IRC.pm
+	perl.exe generate_header
+
+$(TARGET): perl.obj perl.def
+	$(LINK) /DLL /out:$(TARGET) perl.obj $(LDFLAGS) $(PERL514LIB).lib /libpath:$(PERL514PATH) /DELAYLOAD:$(PERL514LIB).dll $(DIRENTLIB) DELAYIMP.LIB user32.lib shell32.lib advapi32.lib /def:perl.def
+
+clean:
+	@del $(TARGET)
+	@del *.obj
+	@del perl.def
+	@del *.lib
+	@del *.exp
diff --git a/src/makeinc.skel.mak b/src/makeinc.skel.mak
index c9027992..f7bbeeb7 100644
--- a/src/makeinc.skel.mak
+++ b/src/makeinc.skel.mak
@@ -18,6 +18,8 @@ PERL510LIB = perl510
 PERL510OUTPUT = xcperl-510.dll
 PERL512LIB = perl512
 PERL512OUTPUT = xcperl-512.dll
+PERL514LIB = perl514
+PERL514OUTPUT = xcperl-514.dll
 
 PYTHONLIB = python27
 PYTHONOUTPUT = xcpython.dll
@@ -32,6 +34,7 @@ LDFLAGS = $(LDFLAGS) msvcrt_win2003.obj
 
 PERL510PATH = c:\mozilla-build\perl-5.10-x64\lib\CORE
 PERL512PATH = c:\mozilla-build\perl-5.12-x64\lib\CORE
+PERL514PATH = c:\mozilla-build\perl-5.14-x64\lib\CORE
 PYTHONPATH = c:\mozilla-build\python-2.7-x64
 TCLPATH = c:\mozilla-build\tcl-8.5-x64
 !else
@@ -39,6 +42,7 @@ LDFLAGS = $(LDFLAGS) msvcrt_winxp.obj
 
 PERL510PATH = c:\mozilla-build\perl-5.10-x86\lib\CORE
 PERL512PATH = c:\mozilla-build\perl-5.12-x86\lib\CORE
+PERL514PATH = c:\mozilla-build\perl-5.14-x86\lib\CORE
 PYTHONPATH = c:\mozilla-build\python-2.7-x86
 TCLPATH = c:\mozilla-build\tcl-8.5-x86
 !endif