diff --git a/plugins/perl/perl-516.vcxproj b/plugins/perl/perl-516.vcxproj deleted file mode 100644 index 4345eb0a..00000000 --- a/plugins/perl/perl-516.vcxproj +++ /dev/null @@ -1,124 +0,0 @@ - - - - - Release - Win32 - - - Release - x64 - - - - {58654438-F674-42F7-88FA-73EF90AD80B1} - Win32Proj - perl516 - - - - DynamicLibrary - false - true - MultiByte - - - DynamicLibrary - false - true - MultiByte - - - - - - - - - - - - - - - false - $(Perl516Output) - $(HexChatBin) - $(HexChatObj)$(ProjectName)\ - - - false - $(Perl516Output) - $(HexChatBin) - $(HexChatObj)$(ProjectName)\ - - - - - - MaxSpeed - true - true - WIN32;NDEBUG;_WINDOWS;_USRDLL;PERL516_EXPORTS;$(OwnFlags);%(PreprocessorDefinitions) - $(Perl516Path)\lib\CORE;$(IntDir);..\..\src\common;%(AdditionalIncludeDirectories) - true - - - Windows - true - true - true - $(OutDir);%(AdditionalLibraryDirectories) - $(Perl516Lib).lib;%(AdditionalDependencies) - perl.def - $(Perl516Lib).dll;%(DelayLoadDLLs) - - - "$(GendefPath)\gendef" "$(Perl516Path)\bin\$(Perl516Lib).dll" -move $(Perl516Lib).def "$(IntDir)" -lib /nologo /machine:x86 "/def:$(IntDir)$(Perl516Lib).def" "/out:$(OutDir)\$(Perl516Lib).lib" -"$(Perl516Path)\bin\perl.exe" generate_header -move irc.pm.h "$(IntDir)" -move xchat.pm.h "$(IntDir)" - - - - - - - MaxSpeed - true - true - WIN32;_WIN64;_AMD64_;NDEBUG;_WINDOWS;_USRDLL;PERL516_EXPORTS;$(OwnFlags);%(PreprocessorDefinitions) - $(Perl516Path)\lib\CORE;$(IntDir);..\..\src\common;%(AdditionalIncludeDirectories) - true - - - Windows - true - true - true - $(OutDir);%(AdditionalLibraryDirectories) - $(Perl516Lib).lib;%(AdditionalDependencies) - perl.def - $(Perl516Lib).dll;%(DelayLoadDLLs) - - - "$(GendefPath)\gendef" "$(Perl516Path)\bin\$(Perl516Lib).dll" -move $(Perl516Lib).def "$(IntDir)" -lib /nologo /machine:x64 "/def:$(IntDir)$(Perl516Lib).def" "/out:$(OutDir)\$(Perl516Lib).lib" -"$(Perl516Path)\bin\perl.exe" generate_header -move irc.pm.h "$(IntDir)" -move xchat.pm.h "$(IntDir)" - - - - - - - - - - - - \ No newline at end of file diff --git a/plugins/perl/perl-518.vcxproj b/plugins/perl/perl-518.vcxproj index 1b4cac9f..220aa0eb 100644 --- a/plugins/perl/perl-518.vcxproj +++ b/plugins/perl/perl-518.vcxproj @@ -42,13 +42,13 @@ false - $(Perl518Output) + $(PerlOutput) $(HexChatBin) $(HexChatObj)$(ProjectName)\ false - $(Perl518Output) + $(PerlOutput) $(HexChatBin) $(HexChatObj)$(ProjectName)\ @@ -60,7 +60,7 @@ true true WIN32;NDEBUG;_WINDOWS;_USRDLL;PERL518_EXPORTS;$(OwnFlags);%(PreprocessorDefinitions) - $(Perl518Path)\lib\CORE;$(IntDir);..\..\src\common;%(AdditionalIncludeDirectories) + $(PerlPath)\lib\CORE;$(IntDir);..\..\src\common;%(AdditionalIncludeDirectories) true @@ -69,15 +69,15 @@ true true $(OutDir);%(AdditionalLibraryDirectories) - $(Perl518Lib).lib;%(AdditionalDependencies) + $(PerlLib).lib;%(AdditionalDependencies) perl.def - $(Perl518Lib).dll;%(DelayLoadDLLs) + $(PerlLib).dll;%(DelayLoadDLLs) - "$(GendefPath)\gendef" "$(Perl518Path)\bin\$(Perl518Lib).dll" -move $(Perl518Lib).def "$(IntDir)" -lib /nologo /machine:x86 "/def:$(IntDir)$(Perl518Lib).def" "/out:$(OutDir)\$(Perl518Lib).lib" -"$(Perl518Path)\bin\perl.exe" generate_header + "$(GendefPath)\gendef" "$(PerlPath)\bin\$(PerlLib).dll" +move $(PerlLib).def "$(IntDir)" +lib /nologo /machine:x86 "/def:$(IntDir)$(PerlLib).def" "/out:$(OutDir)\$(PerlLib).lib" +"$(PerlPath)\bin\perl.exe" generate_header move irc.pm.h "$(IntDir)" move xchat.pm.h "$(IntDir)" @@ -90,7 +90,7 @@ move xchat.pm.h "$(IntDir)" true true WIN32;_WIN64;_AMD64_;NDEBUG;_WINDOWS;_USRDLL;PERL518_EXPORTS;$(OwnFlags);%(PreprocessorDefinitions) - $(Perl518Path)\lib\CORE;$(IntDir);..\..\src\common;%(AdditionalIncludeDirectories) + $(PerlPath)\lib\CORE;$(IntDir);..\..\src\common;%(AdditionalIncludeDirectories) true @@ -99,15 +99,15 @@ move xchat.pm.h "$(IntDir)" true true $(OutDir);%(AdditionalLibraryDirectories) - $(Perl518Lib).lib;%(AdditionalDependencies) + $(PerlLib).lib;%(AdditionalDependencies) perl.def - $(Perl518Lib).dll;%(DelayLoadDLLs) + $(PerlLib).dll;%(DelayLoadDLLs) - "$(GendefPath)\gendef" "$(Perl518Path)\bin\$(Perl518Lib).dll" -move $(Perl518Lib).def "$(IntDir)" -lib /nologo /machine:x64 "/def:$(IntDir)$(Perl518Lib).def" "/out:$(OutDir)\$(Perl518Lib).lib" -"$(Perl518Path)\bin\perl.exe" generate_header + "$(GendefPath)\gendef" "$(PerlPath)\bin\$(PerlLib).dll" +move $(PerlLib).def "$(IntDir)" +lib /nologo /machine:x64 "/def:$(IntDir)$(PerlLib).def" "/out:$(OutDir)\$(PerlLib).lib" +"$(PerlPath)\bin\perl.exe" generate_header move irc.pm.h "$(IntDir)" move xchat.pm.h "$(IntDir)" diff --git a/plugins/perl/perl-518.vcxproj.filters b/plugins/perl/perl-518.vcxproj.filters deleted file mode 100644 index f6d00b5c..00000000 --- a/plugins/perl/perl-518.vcxproj.filters +++ /dev/null @@ -1,23 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - - - Resource Files - - - - - Source Files - - - \ No newline at end of file diff --git a/plugins/perl/perl-516.vcxproj.filters b/plugins/perl/perl.vcxproj.filters similarity index 100% rename from plugins/perl/perl-516.vcxproj.filters rename to plugins/perl/perl.vcxproj.filters diff --git a/win32/hexchat.props b/win32/hexchat.props index 083ec132..00ef030b 100644 --- a/win32/hexchat.props +++ b/win32/hexchat.props @@ -13,8 +13,7 @@ c:\mozilla-build\hexchat\gtk c:\mozilla-build\gendef c:\mozilla-build\msgfmt - c:\mozilla-build\perl-5.16 - c:\mozilla-build\perl-5.18 + c:\mozilla-build\perl-5.18 c:\mozilla-build\python-2.7 @@ -24,12 +23,9 @@ $(YourDepsPath)\$(PlatformName) $(YourGendefPath) $(YourMsgfmtPath) - $(YourPerl516Path)\$(PlatformName) - perl516 - hcperl-516 - $(YourPerl518Path)\$(PlatformName) - perl517 - hcperl-518 + $(YourPerlPath)\$(PlatformName) + perl517 + hcperl $(YourPythonPath)\$(PlatformName) python27 hcpython @@ -89,8 +85,7 @@ copy "$(HexChatBin)hcdoat.dll" "$(HexChatRel)\plugins" copy "$(HexChatBin)hcexec.dll" "$(HexChatRel)\plugins" copy "$(HexChatBin)hcfishlim.dll" "$(HexChatRel)\plugins" copy "$(HexChatBin)hcmpcinfo.dll" "$(HexChatRel)\plugins" -::copy "$(HexChatBin)hcperl-516.dll" "$(HexChatRel)\plugins" -copy "$(HexChatBin)hcperl-518.dll" "$(HexChatRel)\plugins" +copy "$(HexChatBin)hcperl.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/hexchat.sln b/win32/hexchat.sln index a2131b16..004084de 100644 --- a/win32/hexchat.sln +++ b/win32/hexchat.sln @@ -30,8 +30,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "scripting", "scripting", "{ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "common", "common", "{BB051F0F-A841-4A9A-BAF6-51DD9866D65A}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "perl-516", "..\plugins\perl\perl-516.vcxproj", "{58654438-F674-42F7-88FA-73EF90AD80B1}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "python", "..\plugins\python\python.vcxproj", "{19C52A0A-A790-409E-A28A-9745FF990F5C}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "doat", "..\plugins\doat\doat.vcxproj", "{4980AF24-9D42-427D-A8E6-0DF3B97C455D}" @@ -90,7 +88,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "htm", "..\src\htm\htm.cspro EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "make-te", "..\src\common\make-te.vcxproj", "{A7D7CE59-2A31-48AE-BED2-A9828E241832}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "perl-518", "..\plugins\perl\perl-518.vcxproj", "{D90BC3E3-1341-4849-9354-5F40489D39D1}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "perl", "..\plugins\perl\perl.vcxproj", "{D90BC3E3-1341-4849-9354-5F40489D39D1}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -118,8 +116,6 @@ Global {E93E1255-95D1-4B08-8FDF-B53CC6A21280}.Release|Win32.Build.0 = Release|Win32 {E93E1255-95D1-4B08-8FDF-B53CC6A21280}.Release|x64.ActiveCfg = Release|x64 {E93E1255-95D1-4B08-8FDF-B53CC6A21280}.Release|x64.Build.0 = Release|x64 - {58654438-F674-42F7-88FA-73EF90AD80B1}.Release|Win32.ActiveCfg = Release|Win32 - {58654438-F674-42F7-88FA-73EF90AD80B1}.Release|x64.ActiveCfg = Release|x64 {19C52A0A-A790-409E-A28A-9745FF990F5C}.Release|Win32.ActiveCfg = Release|Win32 {19C52A0A-A790-409E-A28A-9745FF990F5C}.Release|Win32.Build.0 = Release|Win32 {19C52A0A-A790-409E-A28A-9745FF990F5C}.Release|x64.ActiveCfg = Release|x64 @@ -211,7 +207,6 @@ Global {6C0CA980-97C5-427A-BE61-5BCECAFABBDA} = {561126F4-FA18-45FC-A2BF-8F858F161D6D} {3024CF36-85E5-4E00-9608-7002E2C7EF14} = {561126F4-FA18-45FC-A2BF-8F858F161D6D} {E7F4DB0A-510D-41EF-B284-6E1DE1CC450D} = {561126F4-FA18-45FC-A2BF-8F858F161D6D} - {58654438-F674-42F7-88FA-73EF90AD80B1} = {D237DA6B-BD5F-46C0-8BEA-50E9A1340240} {19C52A0A-A790-409E-A28A-9745FF990F5C} = {D237DA6B-BD5F-46C0-8BEA-50E9A1340240} {D90BC3E3-1341-4849-9354-5F40489D39D1} = {D237DA6B-BD5F-46C0-8BEA-50E9A1340240} {B10A2C41-344C-43E0-A32D-B9587C198D8B} = {0FD996A7-464F-4981-8380-3DCA3A244A13} diff --git a/win32/installer/hexchat-x64.skel.iss b/win32/installer/hexchat-x64.skel.iss index 9be326af..a3c7fb6d 100644 --- a/win32/installer/hexchat-x64.skel.iss +++ b/win32/installer/hexchat-x64.skel.iss @@ -53,9 +53,6 @@ Name: "langs\python"; Description: "Python (requires Python 2.7)"; Types: custom [Tasks] Name: portable; Description: "Yes"; GroupDescription: "Portable Install (no Registry entries, no Start Menu icons, no uninstaller):"; Flags: unchecked -;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 Root: HKCR; Subkey: "irc"; ValueType: string; ValueName: ""; ValueData: "URL:IRC Protocol"; Flags: uninsdeletevalue; Tasks: not portable @@ -150,11 +147,7 @@ Source: "plugins\hcsysinfo.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; ;Source: "plugins\hcwmpa.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\wmpa Source: "plugins\hcpython.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: langs\python - -;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: "plugins\hcperl.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: langs\perl 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 3de70172..357bcee5 100644 --- a/win32/installer/hexchat-x86.skel.iss +++ b/win32/installer/hexchat-x86.skel.iss @@ -52,9 +52,6 @@ Name: "langs\python"; Description: "Python (requires Python 2.7)"; Types: custom [Tasks] Name: portable; Description: "Yes"; GroupDescription: "Portable Install (no Registry entries, no Start Menu icons, no uninstaller):"; Flags: unchecked -;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 Root: HKCR; Subkey: "irc"; ValueType: string; ValueName: ""; ValueData: "URL:IRC Protocol"; Flags: uninsdeletevalue; Tasks: not portable @@ -149,11 +146,7 @@ Source: "plugins\hcsysinfo.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; ;Source: "plugins\hcwmpa.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\wmpa Source: "plugins\hcpython.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: langs\python - -;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: "plugins\hcperl.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: langs\perl Source: "hexchat.exe"; DestDir: "{app}"; Flags: ignoreversion; Components: libs Source: "hexchat-text.exe"; DestDir: "{app}"; Flags: ignoreversion; Components: xctext