Remove old stuff, some preparation for soon-to-be-released Perl 5.18

3 files changed, 11 insertions, 20 deletions

diff --git a/win32/hexchat.props b/win32/hexchat.props
index 58b9a94b..a71d89db 100644
--- a/win32/hexchat.props
+++ b/win32/hexchat.props
@@ -7,9 +7,8 @@
 		<YourGendefPath>c:\mozilla-build\gendef</YourGendefPath>

 		<YourMsgfmtPath>c:\mozilla-build\msgfmt</YourMsgfmtPath>

 		<YourTclPath>c:\mozilla-build\tcl-8.5</YourTclPath>

-		<YourPerl512Path>c:\mozilla-build\perl-5.12</YourPerl512Path>

-		<YourPerl514Path>c:\mozilla-build\perl-5.14</YourPerl514Path>

 		<YourPerl516Path>c:\mozilla-build\perl-5.16</YourPerl516Path>

+		<!--YourPerl518Path>c:\mozilla-build\perl-5.18</YourPerl518Path-->

 		<YourPythonPath>c:\mozilla-build\python-2.7</YourPythonPath>

 		<!-- YOU SHOULDN'T TOUCH ANYTHING BELOW -->

 		<!-- G_DISABLE_DEPRECATED is unfeasible due to g_completion_* -->

@@ -17,15 +16,12 @@
 		<DepsRoot>$(YourDepsPath)\$(PlatformName)</DepsRoot>

 		<GendefPath>$(YourGendefPath)</GendefPath>

 		<MsgfmtPath>$(YourMsgfmtPath)</MsgfmtPath>

-		<Perl512Path>$(YourPerl512Path)\$(PlatformName)</Perl512Path>

-		<Perl512Lib>perl512</Perl512Lib>

-		<Perl512Output>hcperl-512</Perl512Output>

-		<Perl514Path>$(YourPerl514Path)\$(PlatformName)</Perl514Path>

-		<Perl514Lib>perl514</Perl514Lib>

-		<Perl514Output>hcperl-514</Perl514Output-->

 		<Perl516Path>$(YourPerl516Path)\$(PlatformName)</Perl516Path>

 		<Perl516Lib>perl516</Perl516Lib>

 		<Perl516Output>hcperl-516</Perl516Output>

+		<!--Perl518Path>$(YourPerl518Path)\$(PlatformName)</Perl518Path>

+		<Perl518Lib>perl518</Perl518Lib>

+		<Perl518Output>hcperl-518</Perl518Output-->

 		<PythonPath>$(YourPythonPath)\$(PlatformName)</PythonPath>

 		<PythonLib>python27</PythonLib>

 		<PythonOutput>hcpython</PythonOutput>

@@ -86,9 +82,8 @@ copy "$(HexChatBin)hcexec.dll" "$(HexChatRel)\plugins"
 copy "$(HexChatBin)hcfishlim.dll" "$(HexChatRel)\plugins"

 copy "$(HexChatBin)hchextray.dll" "$(HexChatRel)\plugins"

 copy "$(HexChatBin)hcmpcinfo.dll" "$(HexChatRel)\plugins"

-::copy "$(HexChatBin)hcperl-512.dll" "$(HexChatRel)\plugins"

-::copy "$(HexChatBin)hcperl-514.dll" "$(HexChatRel)\plugins"

 copy "$(HexChatBin)hcperl-516.dll" "$(HexChatRel)\plugins"

+::copy "$(HexChatBin)hcperl-518.dll" "$(HexChatRel)\plugins"

 copy "$(HexChatBin)hcpython.dll" "$(HexChatRel)\plugins"

 copy "$(HexChatBin)hcupd.dll" "$(HexChatRel)\plugins"

 copy "$(HexChatBin)hcwinamp.dll" "$(HexChatRel)\plugins"

diff --git a/win32/installer/hexchat-x64.skel.iss b/win32/installer/hexchat-x64.skel.iss
index 2304c87f..8c27d6e6 100644
--- a/win32/installer/hexchat-x64.skel.iss
+++ b/win32/installer/hexchat-x64.skel.iss
@@ -53,9 +53,8 @@ Name: "langs\python"; Description: "Python"; Types: custom; Flags: disablenounin
 [Tasks]
 Name: portable; Description: "Yes"; GroupDescription: "Portable Install (no Registry entries, no Start Menu icons, no uninstaller):"; Flags: unchecked
 
-;Name: perl512; Description: "5.12"; GroupDescription: "Perl version:"; Flags: exclusive; Components: langs\perl
-;Name: perl514; Description: "5.14"; GroupDescription: "Perl version:"; Flags: exclusive unchecked; Components: langs\perl
-;Name: perl516; Description: "5.16"; GroupDescription: "Perl version:"; Flags: exclusive unchecked; Components: langs\perl
+;Name: perl516; Description: "5.16"; GroupDescription: "Perl version:"; Flags: exclusive; Components: langs\perl
+;Name: perl518; Description: "5.18"; GroupDescription: "Perl version:"; Flags: exclusive unchecked; Components: langs\perl
 
 [Registry]
 Root: HKCR; Subkey: "irc"; ValueType: none; ValueName: ""; ValueData: ""; Flags: deletekey uninsdeletekey; Tasks: not portable
@@ -149,10 +148,9 @@ Source: "plugins\hcwmpa.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Co
 
 Source: "plugins\hcpython.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: langs\python
 
-;Source: "plugins\hcperl-512.dll"; DestDir: "{app}\plugins"; DestName: "hcperl.dll"; Flags: ignoreversion; Components: langs\perl; Tasks: perl512
-;Source: "plugins\hcperl-514.dll"; DestDir: "{app}\plugins"; DestName: "hcperl.dll"; Flags: ignoreversion; Components: langs\perl; Tasks: perl514
 Source: "plugins\hcperl-516.dll"; DestDir: "{app}\plugins"; DestName: "hcperl.dll"; Flags: ignoreversion; Components: langs\perl
 ; Tasks: perl516
+;Source: "plugins\hcperl-518.dll"; DestDir: "{app}\plugins"; DestName: "hcperl.dll"; Flags: ignoreversion; Components: langs\perl; Tasks: perl518
 
 Source: "hexchat.exe"; DestDir: "{app}"; Flags: ignoreversion; Components: libs
 Source: "hexchat-text.exe"; DestDir: "{app}"; Flags: ignoreversion; Components: xctext
diff --git a/win32/installer/hexchat-x86.skel.iss b/win32/installer/hexchat-x86.skel.iss
index b72a9d47..e32f16f5 100644
--- a/win32/installer/hexchat-x86.skel.iss
+++ b/win32/installer/hexchat-x86.skel.iss
@@ -52,9 +52,8 @@ Name: "langs\python"; Description: "Python"; Types: custom; Flags: disablenounin
 [Tasks]
 Name: portable; Description: "Yes"; GroupDescription: "Portable Install (no Registry entries, no Start Menu icons, no uninstaller):"; Flags: unchecked
 
-;Name: perl512; Description: "5.12"; GroupDescription: "Perl version:"; Flags: exclusive; Components: langs\perl
-;Name: perl514; Description: "5.14"; GroupDescription: "Perl version:"; Flags: exclusive unchecked; Components: langs\perl
-;Name: perl516; Description: "5.16"; GroupDescription: "Perl version:"; Flags: exclusive unchecked; Components: langs\perl
+;Name: perl516; Description: "5.16"; GroupDescription: "Perl version:"; Flags: exclusive; Components: langs\perl
+;Name: perl518; Description: "5.18"; GroupDescription: "Perl version:"; Flags: exclusive unchecked; Components: langs\perl
 
 [Registry]
 Root: HKCR; Subkey: "irc"; ValueType: none; ValueName: ""; ValueData: ""; Flags: deletekey uninsdeletekey; Tasks: not portable
@@ -148,10 +147,9 @@ Source: "plugins\hcwmpa.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Co
 
 Source: "plugins\hcpython.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: langs\python
 
-;Source: "plugins\hcperl-512.dll"; DestDir: "{app}\plugins"; DestName: "hcperl.dll"; Flags: ignoreversion; Components: langs\perl; Tasks: perl512
-;Source: "plugins\hcperl-514.dll"; DestDir: "{app}\plugins"; DestName: "hcperl.dll"; Flags: ignoreversion; Components: langs\perl; Tasks: perl514
 Source: "plugins\hcperl-516.dll"; DestDir: "{app}\plugins"; DestName: "hcperl.dll"; Flags: ignoreversion; Components: langs\perl
 ; Tasks: perl516
+;Source: "plugins\hcperl-518.dll"; DestDir: "{app}\plugins"; DestName: "hcperl.dll"; Flags: ignoreversion; Components: langs\perl; Tasks: perl518
 
 Source: "hexchat.exe"; DestDir: "{app}"; Flags: ignoreversion; Components: libs
 Source: "hexchat-text.exe"; DestDir: "{app}"; Flags: ignoreversion; Components: xctext