]> jfr.im git - irc/hexchat/hexchat.git/commitdiff
perl: Update Perl to 5.20
authortomek <redacted>
Wed, 28 May 2014 16:22:19 +0000 (18:22 +0200)
committertomek <redacted>
Wed, 28 May 2014 16:22:19 +0000 (18:22 +0200)
plugins/perl/perl.vcxproj
win32/hexchat.props
win32/installer/hexchat.iss.tt

index 9d23ad5836f1e9399c4ccb678cfbee51f9f036aa..1a76928d8852aea19a34d6e497c7de7bf55524d0 100644 (file)
@@ -16,7 +16,7 @@
   <PropertyGroup Label="Globals">\r
     <ProjectGuid>{D90BC3E3-1341-4849-9354-5F40489D39D1}</ProjectGuid>\r
     <Keyword>Win32Proj</Keyword>\r
-    <RootNamespace>perl518</RootNamespace>\r
+    <RootNamespace>perl520</RootNamespace>\r
   </PropertyGroup>\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">\r
@@ -61,7 +61,7 @@
       </PrecompiledHeader>\r
       <FunctionLevelLinking>true</FunctionLevelLinking>\r
       <IntrinsicFunctions>true</IntrinsicFunctions>\r
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PERL518_EXPORTS;$(OwnFlags);%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PERL520_EXPORTS;$(OwnFlags);%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <AdditionalIncludeDirectories>$(PerlPath)\lib\CORE;$(IntDir);..\..\src\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <MultiProcessorCompilation>true</MultiProcessorCompilation>\r
     </ClCompile>\r
@@ -90,7 +90,7 @@ move hexchat.pm.h "$(IntDir)"</Command>
       </PrecompiledHeader>\r
       <FunctionLevelLinking>true</FunctionLevelLinking>\r
       <IntrinsicFunctions>true</IntrinsicFunctions>\r
-      <PreprocessorDefinitions>WIN32;_WIN64;_AMD64_;NDEBUG;_WINDOWS;_USRDLL;PERL518_EXPORTS;$(OwnFlags);%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <PreprocessorDefinitions>WIN32;_WIN64;_AMD64_;NDEBUG;_WINDOWS;_USRDLL;PERL520_EXPORTS;$(OwnFlags);%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <AdditionalIncludeDirectories>$(PerlPath)\lib\CORE;$(IntDir);..\..\src\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <MultiProcessorCompilation>true</MultiProcessorCompilation>\r
     </ClCompile>\r
index 895f65b5f35e35d89c8aae62f0f3ca6774208495..74beb6ff344371f2afaa4043efd3427493d383f3 100644 (file)
@@ -9,7 +9,7 @@
                <YourDepsPath>c:\mozilla-build\hexchat\gtk</YourDepsPath>\r
                <YourGendefPath>c:\mozilla-build\gendef</YourGendefPath>\r
                <YourMsgfmtPath>c:\mozilla-build\msgfmt</YourMsgfmtPath>\r
-               <YourPerlPath>c:\mozilla-build\perl-5.18</YourPerlPath>\r
+               <YourPerlPath>c:\mozilla-build\perl-5.20</YourPerlPath>\r
                <YourPython2Path>c:\mozilla-build\python-2.7</YourPython2Path>\r
                <YourPython3Path>c:\mozilla-build\python-3.4</YourPython3Path>\r
 \r
@@ -22,7 +22,7 @@
                <GendefPath>$(YourGendefPath)</GendefPath>\r
                <MsgfmtPath>$(YourMsgfmtPath)</MsgfmtPath>\r
                <PerlPath>$(YourPerlPath)\$(PlatformName)</PerlPath>\r
-               <PerlLib>perl518</PerlLib>\r
+               <PerlLib>perl520</PerlLib>\r
                <PerlOutput>hcperl</PerlOutput>\r
                <Python2Path>$(YourPython2Path)\$(PlatformName)</Python2Path>\r
                <Python2Lib>python27</Python2Lib>\r
index 884e9cab7124b1b6a3bd2670e40ff280e9096752..ba68c3bc1727a7de06cae2404dca03a85955f936 100644 (file)
@@ -273,7 +273,7 @@ begin
                if IsComponentSelected('spell') and not CheckSpellInstall() then
                        idpAddFile(SPELL, ExpandConstant('{tmp}\spelling-dicts.exe'));
                        
-               if IsComponentSelected('langs\perl') and not CheckDLL('perl518.dll') then
+               if IsComponentSelected('langs\perl') and not CheckDLL('perl520.dll') then
                        idpAddFile(PERL, ExpandConstant('{tmp}\perl.exe'));
                        
                if IsComponentSelected('langs\python\python2') and not CheckDLL('python27.dll') then