build mod_perl and fs_perl correctly on windows.

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@765 d0543943-73ff-0310-b7d9-9358b9ac24b2

diff --git a/src/mod/languages/mod_perl/fs_perl.vcproj b/src/mod/languages/mod_perl/fs_perl.vcproj
index 36d6f476066ea12e864cf0df73a30088236ce8c3..467b6b6c0378901a0dffd70d0e74ac22e9385b7c 100644 (file)
--- a/src/mod/languages/mod_perl/fs_perl.vcproj
+++ b/src/mod/languages/mod_perl/fs_perl.vcproj
@@ -24,7 +24,7 @@
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
-                               CommandLine="if not exist perlxsi.c perl -MExtUtils::Embed -e xsinit"\r
+                               CommandLine=""\r
                        />\r
                        <Tool\r
                                Name="VCCustomBuildTool"\r
@@ -63,7 +63,6 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalOptions="/EXPORT:xs_init"\r
                                OutputFile="$(OutDir)\Perl\$(ProjectName).dll"\r
                                LinkIncremental="2"\r
                                GenerateDebugInformation="true"\r
@@ -106,7 +105,7 @@
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
-                               CommandLine="if not exist perlxsi.c perl -MExtUtils::Embed -e xsinit"\r
+                               CommandLine=""\r
                        />\r
                        <Tool\r
                                Name="VCCustomBuildTool"\r
@@ -142,7 +141,6 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalOptions="/EXPORT:xs_init"\r
                                OutputFile="$(OutDir)\Perl\$(ProjectName).dll"\r
                                LinkIncremental="1"\r
                                GenerateDebugInformation="true"\r
@@ -186,10 +184,6 @@
                        Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
                        UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
                        >\r
-                       <File\r
-                               RelativePath=".\perlxsi.c"\r
-                               >\r
-                       </File>\r
                        <File\r
                                RelativePath=".\switch_swig.c"\r
                                >\r

diff --git a/src/mod/languages/mod_perl/mod_perl.vcproj b/src/mod/languages/mod_perl/mod_perl.vcproj
index 0faec3563f6a9ed6a227a9aef4011bccb1cf58d3..8449177184fefc2b34a982cd3ac4c1d6f98c4e51 100644 (file)
--- a/src/mod/languages/mod_perl/mod_perl.vcproj
+++ b/src/mod/languages/mod_perl/mod_perl.vcproj
@@ -25,7 +25,7 @@
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
-                               CommandLine="cscript /nologo $(InputDir)..\..\..\..\w32\vsnet\getlibs.vbs mod_perl Debug"\r
+                               CommandLine="if not exist perlxsi.c perl -MExtUtils::Embed -e xsinit"\r
                        />\r
                        <Tool\r
                                Name="VCCustomBuildTool"\r
@@ -109,7 +109,7 @@
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
-                               CommandLine="cscript /nologo $(InputDir)..\..\..\..\w32\vsnet\getlibs.vbs mod_perl Release"\r
+                               CommandLine="if not exist perlxsi.c perl -MExtUtils::Embed -e xsinit"\r
                        />\r
                        <Tool\r
                                Name="VCCustomBuildTool"\r
@@ -195,6 +195,10 @@
                                RelativePath=".\mod_perl.c"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath=".\perlxsi.c"\r
+                               >\r
+                       </File>\r
                </Filter>\r
                <Filter\r
                        Name="Header Files"\r

diff --git a/src/switch_loadable_module.c b/src/switch_loadable_module.c
index 9b37ee35397b4719fcae0164f561cbfa9ff56abf..1d513795895dd7a47fc79a430786154a2dd1292b 100644 (file)
--- a/src/switch_loadable_module.c
+++ b/src/switch_loadable_module.c
@@ -316,15 +316,15 @@ static void switch_loadable_module_path_init()
        char *path =NULL, *working =NULL;
        apr_dir_t *perl_dir_handle = NULL;
 
-       apr_env_get(&path, "path", loadable_modules.pool);\r
-       apr_filepath_get(&working, APR_FILEPATH_NATIVE , loadable_modules.pool);\r
-
-       if (apr_dir_open(&perl_dir_handle, ".\\perl", loadable_modules.pool) == APR_SUCCESS) {\r
-                       apr_dir_close(perl_dir_handle);\r
-                       apr_env_set("path", \r
-                                               apr_pstrcat(loadable_modules.pool, path, ";", working, "\\perl", NULL), \r
-                                               loadable_modules.pool);\r
-       }\r
+       apr_env_get(&path, "path", loadable_modules.pool);
+       apr_filepath_get(&working, APR_FILEPATH_NATIVE , loadable_modules.pool);
+
+       if (apr_dir_open(&perl_dir_handle, ".\\perl", loadable_modules.pool) == APR_SUCCESS) {
+                       apr_dir_close(perl_dir_handle);
+                       apr_env_set("path", 
+                                               apr_pstrcat(loadable_modules.pool, path, ";", working, "\\perl", NULL), 
+                                               loadable_modules.pool);
+       }
 }
 #endif
 
@@ -357,7 +357,7 @@ SWITCH_DECLARE(switch_status) switch_loadable_module_init()
 
 
 #ifdef WIN32
-       switch_loadable_module_path_init();\r
+       switch_loadable_module_path_init();
 #endif
 
        switch_core_hash_init(&loadable_modules.module_hash, loadable_modules.pool);

diff --git a/w32/vsnet/Freeswitch.sln b/w32/vsnet/Freeswitch.sln
index 885e77ef17e2000e4025dbcaa57426e4e5e34e6a..4f5b3fd0f9afc0bb594c4340e5c051128fe25aca 100644 (file)
--- a/w32/vsnet/Freeswitch.sln
+++ b/w32/vsnet/Freeswitch.sln
@@ -151,8 +151,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Languages", "Languages", "{
 EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_spidermonkey", "..\..\src\mod\languages\mod_spidermonkey\mod_spidermonkey.vcproj", "{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}"\r
        ProjectSection(ProjectDependencies) = postProject\r
-               {89385C74-5860-4174-9CAF-A39E7C48909C} = {89385C74-5860-4174-9CAF-A39E7C48909C}\r
                {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}\r
+               {89385C74-5860-4174-9CAF-A39E7C48909C} = {89385C74-5860-4174-9CAF-A39E7C48909C}\r
        EndProjectSection\r
 EndProject\r
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ASR-TTS", "ASR-TTS", "{4CF6A6AC-07DE-4B9E-ABE1-7F98B64E0BB0}"\r
@@ -169,7 +169,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fs_perl", "..\..\src\mod\la
 EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_perl", "..\..\src\mod\languages\mod_perl\mod_perl.vcproj", "{7B077E7F-1BE7-4291-AB86-55E527B25CAC}"\r
        ProjectSection(ProjectDependencies) = postProject\r
-               {B0C6CFF9-7DCD-4A21-8BA4-C2011E18DED8} = {B0C6CFF9-7DCD-4A21-8BA4-C2011E18DED8}\r
                {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}\r
        EndProjectSection\r
 EndProject\r