summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorberkeviktor@aol.com <berkeviktor@aol.com>2010-10-09 19:36:17 +0200
committerberkeviktor@aol.com <berkeviktor@aol.com>2010-10-09 19:36:17 +0200
commit0b43ae7cb6872b9ccab6b7157a2333b5ac83dc01 (patch)
treea935a18fc23ff3181a1e2c07544e7a0c8cbe952f
parent53f344c07fe73698c6460a9beeeeba22335740af (diff)
remove ancient perl 5.8 from distro
-rw-r--r--build/build-x64.bat3
-rw-r--r--build/build-x86.bat3
-rw-r--r--build/release-x64.bat1
-rw-r--r--build/release-x86.bat1
-rw-r--r--build/xchat-wdk.iss4
-rw-r--r--plugins/perl/makefile-58.mak36
6 files changed, 0 insertions, 48 deletions
diff --git a/build/build-x64.bat b/build/build-x64.bat
index a6c10002..ddd49a79 100644
--- a/build/build-x64.bat
+++ b/build/build-x64.bat
@@ -19,9 +19,6 @@ nmake /nologo /f makefile.mak clean
 nmake /nologo /f makefile.mak
 cd perl
 set OOPATH=%PATH%
-set PATH=%OOPATH%;c:\mozilla-build\perl-5.8-x64\bin
-nmake /nologo /s /f makefile-58.mak clean
-nmake /nologo /s /f makefile-58.mak
 set PATH=%OOPATH%;c:\mozilla-build\perl-5.10-x64\bin
 nmake /nologo /s /f makefile-510.mak clean
 nmake /nologo /s /f makefile-510.mak
diff --git a/build/build-x86.bat b/build/build-x86.bat
index 3dbd169e..be345934 100644
--- a/build/build-x86.bat
+++ b/build/build-x86.bat
@@ -15,9 +15,6 @@ nmake /nologo /f makefile.mak clean
 nmake /nologo /f makefile.mak
 cd perl
 set OOPATH=%PATH%
-set PATH=%OOPATH%;c:\mozilla-build\perl-5.8-x86\bin
-nmake /nologo /s /f makefile-58.mak clean
-nmake /nologo /s /f makefile-58.mak
 set PATH=%OOPATH%;c:\mozilla-build\perl-5.10-x86\bin
 nmake /nologo /s /f makefile-510.mak clean
 nmake /nologo /s /f makefile-510.mak
diff --git a/build/release-x64.bat b/build/release-x64.bat
index 4770082d..790c1ccf 100644
--- a/build/release-x64.bat
+++ b/build/release-x64.bat
@@ -34,7 +34,6 @@ copy %ENCHANT_BIN%\libenchant.dll %XCHAT_DEST%\libenchant.dll.x64
 copy %ENCHANT_BIN%\..\lib\enchant\libenchant_myspell.dll %XCHAT_DEST%\lib\enchant\libenchant_myspell.dll.x64
 copy ..\plugins\ewc\xcewc.dll %XCHAT_DEST%\plugins\xcewc.dll.x64
 copy ..\plugins\lua\xclua.dll %XCHAT_DEST%\plugins\xclua.dll.x64
-copy ..\plugins\perl\xcperl-58.dll %XCHAT_DEST%\plugins\xcperl-58.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\python\xcpython.dll %XCHAT_DEST%\plugins\xcpython.dll.x64
diff --git a/build/release-x86.bat b/build/release-x86.bat
index 0e0b77ba..c30fe09d 100644
--- a/build/release-x86.bat
+++ b/build/release-x86.bat
@@ -47,7 +47,6 @@ copy %ENCHANT_BIN%\libenchant.dll %XCHAT_DEST%
 xcopy /q /s /i %ENCHANT_BIN%\..\lib\enchant\libenchant_myspell.dll %XCHAT_DEST%\lib\enchant\
 xcopy /q /s /i ..\plugins\ewc\xcewc.dll %XCHAT_DEST%\plugins\
 copy ..\plugins\lua\xclua.dll %XCHAT_DEST%\plugins
-copy ..\plugins\perl\xcperl-58.dll %XCHAT_DEST%\plugins
 copy ..\plugins\perl\xcperl-510.dll %XCHAT_DEST%\plugins
 copy ..\plugins\perl\xcperl-512.dll %XCHAT_DEST%\plugins
 copy ..\plugins\python\xcpython.dll %XCHAT_DEST%\plugins
diff --git a/build/xchat-wdk.iss b/build/xchat-wdk.iss
index 7d9612b4..b2693217 100644
--- a/build/xchat-wdk.iss
+++ b/build/xchat-wdk.iss
@@ -58,7 +58,6 @@ Name: portable; Description: "Yes"; GroupDescription: "Portable Install (no Regi
 ;Name: xtray; Description: "X-Tray"; GroupDescription: "Tray Icon"; Flags: exclusive

 ;Name: noxtray; Description: "Plugin-Tray"; GroupDescription: "Tray Icon"; Flags: exclusive unchecked

 

-Name: perl58; Description: "5.8"; GroupDescription: "Perl version:"; Flags: exclusive unchecked; Components: langs\perl

 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

 

@@ -207,9 +206,6 @@ Source: "plugins\xctcl.dll.x64"; DestDir: "{app}\plugins"; DestName: "xctcl.dll"
 

 

 

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

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

-

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

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

 

diff --git a/plugins/perl/makefile-58.mak b/plugins/perl/makefile-58.mak
deleted file mode 100644
index 7af53b1c..00000000
--- a/plugins/perl/makefile-58.mak
+++ /dev/null
@@ -1,36 +0,0 @@
-include "..\..\src\makeinc.mak"
-
-TARGET = xcperl-58.dll
-PERLLIB = perl58
-
-!ifdef X64
-PERLPATH = c:\mozilla-build\perl-5.8-x64\lib\CORE
-!else
-PERLPATH = c:\mozilla-build\perl-5.8-x86\lib\CORE
-!endif
-
-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$(PERLPATH) -DPERL_DLL=\"$(PERLLIB).dll\"
-
-perl.c: xchat.pm.h
-
-xchat.pm.h: Xchat.pm IRC.pm
-	perl.exe generate_header
-
-$(TARGET): perl.obj perl.def
-	$(LINK) /DLL /out:$(TARGET) perl.obj $(LDFLAGS) $(PERLLIB).lib /libpath:$(PERLPATH) /DELAYLOAD:$(PERLLIB).dll DELAYIMP.LIB user32.lib shell32.lib advapi32.lib /def:perl.def
-
-clean:
-	@del $(TARGET)
-	@del *.obj
-	@del perl.def
-	@del *.lib
-	@del *.exp