Prepare solution for Perl 5.16 VC build

6 files changed, 25 insertions, 30 deletions

diff --git a/plugins/perl/perl-516.vcxproj b/plugins/perl/perl-516.vcxproj
index a62f2e28..4345eb0a 100644
--- a/plugins/perl/perl-516.vcxproj
+++ b/plugins/perl/perl-516.vcxproj
@@ -60,7 +60,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>

       <IntrinsicFunctions>true</IntrinsicFunctions>

       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PERL516_EXPORTS;$(OwnFlags);%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <AdditionalIncludeDirectories>$(Perl516Path)\perl\lib\CORE;$(IntDir);..\..\src\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>$(Perl516Path)\lib\CORE;$(IntDir);..\..\src\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <MultiProcessorCompilation>true</MultiProcessorCompilation>

     </ClCompile>

     <Link>

@@ -74,10 +74,10 @@
       <DelayLoadDLLs>$(Perl516Lib).dll;%(DelayLoadDLLs)</DelayLoadDLLs>

     </Link>

     <PreBuildEvent>

-      <Command>"$(GendefPath)\gendef" "$(Perl516Path)\perl\bin\$(Perl516Lib).dll"

+      <Command>"$(GendefPath)\gendef" "$(Perl516Path)\bin\$(Perl516Lib).dll"

 move $(Perl516Lib).def "$(IntDir)"

 lib /nologo /machine:x86 "/def:$(IntDir)$(Perl516Lib).def" "/out:$(OutDir)\$(Perl516Lib).lib"

-"$(Perl516Path)\perl\bin\perl.exe" generate_header

+"$(Perl516Path)\bin\perl.exe" generate_header

 move irc.pm.h "$(IntDir)"

 move xchat.pm.h "$(IntDir)"</Command>

     </PreBuildEvent>

@@ -90,7 +90,7 @@ move xchat.pm.h "$(IntDir)"</Command>
       <FunctionLevelLinking>true</FunctionLevelLinking>

       <IntrinsicFunctions>true</IntrinsicFunctions>

       <PreprocessorDefinitions>WIN32;_WIN64;_AMD64_;NDEBUG;_WINDOWS;_USRDLL;PERL516_EXPORTS;$(OwnFlags);%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <AdditionalIncludeDirectories>$(Perl516Path)\perl\lib\CORE;$(IntDir);..\..\src\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>$(Perl516Path)\lib\CORE;$(IntDir);..\..\src\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <MultiProcessorCompilation>true</MultiProcessorCompilation>

     </ClCompile>

     <Link>

@@ -104,10 +104,10 @@ move xchat.pm.h "$(IntDir)"</Command>
       <DelayLoadDLLs>$(Perl516Lib).dll;%(DelayLoadDLLs)</DelayLoadDLLs>

     </Link>

     <PreBuildEvent>

-      <Command>"$(GendefPath)\gendef" "$(Perl516Path)\perl\bin\$(Perl516Lib).dll"

+      <Command>"$(GendefPath)\gendef" "$(Perl516Path)\bin\$(Perl516Lib).dll"

 move $(Perl516Lib).def "$(IntDir)"

 lib /nologo /machine:x64 "/def:$(IntDir)$(Perl516Lib).def" "/out:$(OutDir)\$(Perl516Lib).lib"

-"$(Perl516Path)\perl\bin\perl.exe" generate_header

+"$(Perl516Path)\bin\perl.exe" generate_header

 move irc.pm.h "$(IntDir)"

 move xchat.pm.h "$(IntDir)"</Command>

     </PreBuildEvent>

diff --git a/win32/hexchat-xp.props b/win32/hexchat-xp.props
index dcb56d7f..afafa8c4 100644
--- a/win32/hexchat-xp.props
+++ b/win32/hexchat-xp.props
@@ -6,9 +6,9 @@
     <YourDepsPath>c:\mozilla-build\hexchat\deps</YourDepsPath>

     <YourGendefPath>c:\mozilla-build\gendef</YourGendefPath>

     <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>

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

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

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

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

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

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

diff --git a/win32/hexchat.props b/win32/hexchat.props
index 070019d3..9104b1af 100644
--- a/win32/hexchat.props
+++ b/win32/hexchat.props
@@ -92,8 +92,8 @@ copy "$(HexChatBin)hcfishlim.dll" "$(HexChatRel)\plugins"
 copy "$(HexChatBin)hchextray.dll" "$(HexChatRel)\plugins"

 copy "$(HexChatBin)hclua.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-512.dll" "$(HexChatRel)\plugins"

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

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

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

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

diff --git a/win32/hexchat.sln b/win32/hexchat.sln
index 20203296..49688791 100644
--- a/win32/hexchat.sln
+++ b/win32/hexchat.sln
@@ -40,9 +40,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "perl-514", "..\plugins\perl
 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "perl-516", "..\plugins\perl\perl-516.vcxproj", "{58654438-F674-42F7-88FA-73EF90AD80B1}"

-	ProjectSection(ProjectDependencies) = postProject

-		{C4C9FA6F-F990-4C7B-85F6-CD8F4F5728F0} = {C4C9FA6F-F990-4C7B-85F6-CD8F4F5728F0}

-	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "python", "..\plugins\python\python.vcxproj", "{19C52A0A-A790-409E-A28A-9745FF990F5C}"

 EndProject

@@ -142,13 +139,9 @@ Global
 		{2773666A-8CFC-4533-A043-EAD59F16A1C7}.Release|x64.ActiveCfg = Release|x64

 		{2773666A-8CFC-4533-A043-EAD59F16A1C7}.Release|x64.Build.0 = Release|x64

 		{987E9374-98A1-44BA-946F-D3472D7A7055}.Release|Win32.ActiveCfg = Release|Win32

-		{987E9374-98A1-44BA-946F-D3472D7A7055}.Release|Win32.Build.0 = Release|Win32

 		{987E9374-98A1-44BA-946F-D3472D7A7055}.Release|x64.ActiveCfg = Release|x64

-		{987E9374-98A1-44BA-946F-D3472D7A7055}.Release|x64.Build.0 = Release|x64

 		{C4C9FA6F-F990-4C7B-85F6-CD8F4F5728F0}.Release|Win32.ActiveCfg = Release|Win32

-		{C4C9FA6F-F990-4C7B-85F6-CD8F4F5728F0}.Release|Win32.Build.0 = Release|Win32

 		{C4C9FA6F-F990-4C7B-85F6-CD8F4F5728F0}.Release|x64.ActiveCfg = Release|x64

-		{C4C9FA6F-F990-4C7B-85F6-CD8F4F5728F0}.Release|x64.Build.0 = Release|x64

 		{58654438-F674-42F7-88FA-73EF90AD80B1}.Release|Win32.ActiveCfg = Release|Win32

 		{58654438-F674-42F7-88FA-73EF90AD80B1}.Release|Win32.Build.0 = Release|Win32

 		{58654438-F674-42F7-88FA-73EF90AD80B1}.Release|x64.ActiveCfg = Release|x64

diff --git a/win32/installer/hexchat-x64.skel.iss b/win32/installer/hexchat-x64.skel.iss
index 385ccaf2..1e04c82c 100644
--- a/win32/installer/hexchat-x64.skel.iss
+++ b/win32/installer/hexchat-x64.skel.iss
@@ -57,9 +57,9 @@ Name: "langs\tcl"; Description: "Tcl"; Types: custom; Flags: disablenouninstallw
 [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: 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

 

 [Registry]

 Root: HKCR; Subkey: "irc"; ValueType: none; ValueName: ""; ValueData: ""; Flags: deletekey uninsdeletekey; Tasks: not portable

@@ -161,9 +161,10 @@ Source: "plugins\hclua.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Com
 Source: "plugins\hcpython.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: langs\python

 Source: "plugins\hctcl.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: langs\tcl

 

-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-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: "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 ec6a8e7a..8c18ac2f 100644
--- a/win32/installer/hexchat-x86.skel.iss
+++ b/win32/installer/hexchat-x86.skel.iss
@@ -56,9 +56,9 @@ Name: "langs\tcl"; Description: "Tcl"; Types: custom; Flags: disablenouninstallw
 [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: 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

 

 [Registry]

 Root: HKCR; Subkey: "irc"; ValueType: none; ValueName: ""; ValueData: ""; Flags: deletekey uninsdeletekey; Tasks: not portable

@@ -160,9 +160,10 @@ Source: "plugins\hclua.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Com
 Source: "plugins\hcpython.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: langs\python

 Source: "plugins\hctcl.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: langs\tcl

 

-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-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: "hexchat.exe"; DestDir: "{app}"; Flags: ignoreversion; Components: libs

 Source: "hexchat-text.exe"; DestDir: "{app}"; Flags: ignoreversion; Components: xctext