move creation of the version header file to use util.vbs

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

diff --git a/Freeswitch.sln b/Freeswitch.sln
index c1479b4644b8c1a6aa8053d365340c288e43d638..9b5d3da8ceb610df5a3315d1056b01e8c0367525 100644 (file)
--- a/Freeswitch.sln
+++ b/Freeswitch.sln
@@ -11,7 +11,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FreeSwitchConsole", "w32\vs
 EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FreeSwitchCoreLib", "w32\vsnet\FreeSwitchCore.vcproj", "{202D7A4E-760D-4D0E-AFA1-D7459CED30FF}"\r
        ProjectSection(ProjectDependencies) = postProject\r
-               {FE191916-DEDD-43B3-B28C-D09C9088C586} = {FE191916-DEDD-43B3-B28C-D09C9088C586}\r
                {50AD0E28-B8D7-4FCC-8FC3-599F6AC69761} = {50AD0E28-B8D7-4FCC-8FC3-599F6AC69761}\r
                {8D04B550-D240-4A44-8A18-35DA3F7038D9} = {8D04B550-D240-4A44-8A18-35DA3F7038D9}\r
                {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3}\r
@@ -154,8 +153,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Docs", "Docs", "{CBD81696-E
 EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "docs", "docs\docs.vcproj", "{1A1FF289-4FD6-4285-A422-D31DD67A4723}"\r
 EndProject\r
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FreeSwitchVersion", "w32\vsnet\FreeSwitchVersion.vcproj", "{FE191916-DEDD-43B3-B28C-D09C9088C586}"\r
-EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_dialplan_xml", "src\mod\dialplans\mod_dialplan_xml\mod_dialplan_xml.vcproj", "{07113B25-D3AF-4E04-BA77-4CD1171F022C}"\r
        ProjectSection(ProjectDependencies) = postProject\r
                {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}\r
@@ -592,10 +589,6 @@ Global
                {FE3540C5-3303-46E0-A69E-D92F775687F1}.Release|Win32.Build.0 = Release|Win32\r
                {1A1FF289-4FD6-4285-A422-D31DD67A4723}.Debug|Win32.ActiveCfg = Debug|Win32\r
                {1A1FF289-4FD6-4285-A422-D31DD67A4723}.Release|Win32.ActiveCfg = Release|Win32\r
-               {FE191916-DEDD-43B3-B28C-D09C9088C586}.Debug|Win32.ActiveCfg = Debug|Win32\r
-               {FE191916-DEDD-43B3-B28C-D09C9088C586}.Debug|Win32.Build.0 = Debug|Win32\r
-               {FE191916-DEDD-43B3-B28C-D09C9088C586}.Release|Win32.ActiveCfg = Release|Win32\r
-               {FE191916-DEDD-43B3-B28C-D09C9088C586}.Release|Win32.Build.0 = Release|Win32\r
                {07113B25-D3AF-4E04-BA77-4CD1171F022C}.Debug|Win32.ActiveCfg = Debug|Win32\r
                {07113B25-D3AF-4E04-BA77-4CD1171F022C}.Debug|Win32.Build.0 = Debug|Win32\r
                {07113B25-D3AF-4E04-BA77-4CD1171F022C}.Release|Win32.ActiveCfg = Release|Win32\r

diff --git a/libs/win32/util.vbs b/libs/win32/util.vbs
index bec45b1b5d4082cb1990e9c9cdc52435c2282c38..b2cedcd6c711c1a364931b2bc5a2e6fcf8385c8e 100644 (file)
--- a/libs/win32/util.vbs
+++ b/libs/win32/util.vbs
@@ -45,6 +45,9 @@ If objArgs.Count >=3 Then
                        Wget objArgs(1), Showpath(objArgs(2))\r
                Case "GetUnzip"         \r
                        WgetUnCompress objArgs(1), Showpath(objArgs(2))\r
+               Case "Version"                                  \r
+                       'CreateVersion(tmpFolder, VersionDir, includebase, includedest)\r
+                       CreateVersion Showpath(objArgs(1)), Showpath(objArgs(2)), objArgs(3), objArgs(4)\r
        End Select\r
 End If\r
 \r
@@ -180,3 +183,62 @@ Function Showpath(folderspec)
        Set f = FSO.GetFolder(folderspec)\r
        showpath = f.path & "\"\r
 End Function\r
+\r
+Sub FindReplaceInFile(FileName, sFind, sReplace)\r
+       Const OpenAsASCII = 0  ' Opens the file as ASCII (TristateFalse) \r
+       Const OpenAsUnicode = -1  ' Opens the file as Unicode (TristateTrue) \r
+       Const OpenAsDefault = -2  ' Opens the file using the system default \r
+       \r
+       Const OverwriteIfExist = -1 \r
+       Const FailIfNotExist   =  0 \r
+       Const ForReading       =  1 \r
+       \r
+       Set fOrgFile = FSO.OpenTextFile(FileName, ForReading, FailIfNotExist, OpenAsASCII)\r
+       sText = fOrgFile.ReadAll\r
+       fOrgFile.Close\r
+       sText = Replace(sText, sFind, sReplace)\r
+       Set fNewFile = FSO.CreateTextFile(FileName, OverwriteIfExist, OpenAsASCII)\r
+       fNewFile.WriteLine sText\r
+       fNewFile.Close\r
+End Sub\r
+\r
+Sub CreateVersion(tmpFolder, VersionDir, includebase, includedest)\r
+       Dim oExec\r
+       If Right(tmpFolder, 1) <> "\" Then tmpFolder = tmpFolder & "\" End If\r
+       If Not FSO.FileExists(tmpFolder & "svnversion.exe") Then \r
+               Wget ToolsBase & "svnversion.exe", tmpFolder\r
+       End If  \r
+       Dim sLastFile\r
+       Const OverwriteIfExist = -1 \r
+       Const ForReading       =  1 \r
+       VersionCmd="svnversion " & quote & VersionDir & "." & quote &  " -n"\r
+       Set MyFile = fso.CreateTextFile(tmpFolder & "tmpVersion.Bat", True)\r
+       MyFile.WriteLine("@" & "cd " & quote & tmpFolder & quote )\r
+       MyFile.WriteLine("@" & VersionCmd)\r
+       MyFile.Close\r
+       Set oExec = WshShell.Exec(tmpFolder & "tmpVersion.Bat")\r
+       Do\r
+               strFromProc = OExec.StdOut.ReadLine()\r
+               VERSION=strFromProc\r
+       Loop While Not OExec.StdOut.atEndOfStream\r
+       sLastVersion = ""\r
+       Set sLastFile = FSO.OpenTextFile(tmpFolder & "lastversion", ForReading, true, OpenAsASCII)\r
+       If Not sLastFile.atEndOfStream Then\r
+               sLastVersion = sLastFile.ReadLine()\r
+       End If\r
+       sLastFile.Close\r
+       \r
+       If VERSION = "" Then\r
+               VERSION = "UNKNOWN"\r
+       End If\r
+\r
+       If VERSION <> sLastVersion Then\r
+               Set MyFile = fso.CreateTextFile(tmpFolder & "lastversion", True)\r
+               MyFile.WriteLine(VERSION)\r
+               MyFile.Close\r
+       \r
+               FSO.CopyFile includebase, includedest, true\r
+               FindReplaceInFile includedest, "@SVN_VERSION@", VERSION\r
+       End If\r
+       \r
+End Sub\r

diff --git a/w32/vsnet/FreeSwitchCore.vcproj b/w32/vsnet/FreeSwitchCore.vcproj
index c1e59911bda2d24a6dbd84ab5f2a4d67813a1130..6bf5a4d64301b2b984767e87a0df8060bdc6b283 100644 (file)
--- a/w32/vsnet/FreeSwitchCore.vcproj
+++ b/w32/vsnet/FreeSwitchCore.vcproj
@@ -384,6 +384,36 @@
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                </Filter>\r
+               <Filter\r
+                       Name="Generated Header Files"\r
+                       >\r
+                       <File\r
+                               RelativePath="..\..\src\include\switch_version.h.in"\r
+                               >\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCustomBuildTool"\r
+                                               Description="Generating switch_version.h"\r
+                                               CommandLine="cscript /nologo &quot;$(ProjectDir)..\..\libs\win32\util.vbs&quot; Version  &quot;$(ProjectDir)&quot; &quot;$(ProjectDir)..\..\&quot; &quot;$(ProjectDir)..\..\src\include\switch_version.h.in&quot; &quot;$(ProjectDir)..\..\src\include\switch_version.h&quot;&#x0D;&#x0A;"\r
+                                               AdditionalDependencies="..\..\src\include\switch.h;..\..\src\include\switch_apr.h;..\..\src\include\switch_buffer.h;..\..\src\include\switch_caller.h;..\..\src\include\switch_channel.h;..\..\src\include\switch_console.h;..\..\src\include\switch_core.h;..\..\src\include\switch_event.h;..\..\src\include\switch_frame.h;..\..\src\include\switch_ivr.h;..\..\src\include\switch_loadable_module.h;..\..\src\include\switch_log.h;..\..\src\include\switch_module_interfaces.h;..\..\src\include\switch_platform.h;..\..\src\include\switch_resample.h;..\..\src\include\switch_rtp.h;..\..\src\include\switch_sqlite.h;..\..\src\include\switch_stun.h;..\..\src\include\switch_types.h;..\..\src\include\switch_utils.h;..\..\src\include\switch_xml.h;..\..\src\switch_buffer.c;..\..\src\switch_caller.c;..\..\src\switch_channel.c;..\..\src\switch_config.c;..\..\src\switch_console.c;..\..\src\switch_core.c;..\..\src\switch_event.c;..\..\src\switch_ivr.c;..\..\src\switch_loadable_module.c;..\..\src\switch_log.c;..\..\src\switch_resample.c;..\..\src\switch_rtp.c;..\..\src\switch_stun.c;..\..\src\switch_utils.c;..\..\src\switch_xml.c"\r
+                                               Outputs="..\..\src\include\switch_version.h"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCustomBuildTool"\r
+                                               Description="Generating switch_version.h"\r
+                                               CommandLine="cscript /nologo &quot;$(ProjectDir)..\..\libs\win32\util.vbs&quot; Version  &quot;$(ProjectDir)&quot; &quot;$(ProjectDir)..\..\&quot; &quot;$(ProjectDir)..\..\src\include\switch_version.h.in&quot; &quot;$(ProjectDir)..\..\src\include\switch_version.h&quot;&#x0D;&#x0A;"\r
+                                               AdditionalDependencies="..\..\src\include\switch.h;..\..\src\include\switch_apr.h;..\..\src\include\switch_buffer.h;..\..\src\include\switch_caller.h;..\..\src\include\switch_channel.h;..\..\src\include\switch_console.h;..\..\src\include\switch_core.h;..\..\src\include\switch_event.h;..\..\src\include\switch_frame.h;..\..\src\include\switch_ivr.h;..\..\src\include\switch_loadable_module.h;..\..\src\include\switch_log.h;..\..\src\include\switch_module_interfaces.h;..\..\src\include\switch_platform.h;..\..\src\include\switch_resample.h;..\..\src\include\switch_rtp.h;..\..\src\include\switch_sqlite.h;..\..\src\include\switch_stun.h;..\..\src\include\switch_types.h;..\..\src\include\switch_utils.h;..\..\src\include\switch_xml.h;..\..\src\switch_buffer.c;..\..\src\switch_caller.c;..\..\src\switch_channel.c;..\..\src\switch_config.c;..\..\src\switch_console.c;..\..\src\switch_core.c;..\..\src\switch_event.c;..\..\src\switch_ivr.c;..\..\src\switch_loadable_module.c;..\..\src\switch_log.c;..\..\src\switch_resample.c;..\..\src\switch_rtp.c;..\..\src\switch_stun.c;..\..\src\switch_utils.c;..\..\src\switch_xml.c"\r
+                                               Outputs="..\..\src\include\switch_version.h"\r
+                                       />\r
+                               </FileConfiguration>\r
+                       </File>\r
+               </Filter>\r
        </Files>\r
        <Globals>\r
        </Globals>\r