[xiph-commits] r17777 - in trunk/oggdsf: . build/NSIS/Release src/lib/codecs/webm/webmdshow/webmsplit

[cristianadam at svn.xiph.org]

Author: cristianadam
Date: 2011-01-11 16:44:16 -0800 (Tue, 11 Jan 2011)
New Revision: 17777

Added:
   trunk/oggdsf/build/NSIS/Release/fix_manifest.cmd
   trunk/oggdsf/build/NSIS/Release/replace_string.js
Modified:
   trunk/oggdsf/ChangeLog.txt
   trunk/oggdsf/src/lib/codecs/webm/webmdshow/webmsplit/dllentry.cpp
Log:
Fixed webmsplitter first time installation bug.
Added scripts to fix VS2008 wrong CRT version bug.


Modified: trunk/oggdsf/ChangeLog.txt
===================================================================
--- trunk/oggdsf/ChangeLog.txt	2011-01-11 19:02:02 UTC (rev 17776)
+++ trunk/oggdsf/ChangeLog.txt	2011-01-12 00:44:16 UTC (rev 17777)
@@ -1,4 +1,4 @@
-Version 0.85.17776 - 11.01.2011
+Version 0.85.17777 - 12.01.2011
 
     * Fixed project configuration which referenced two CRT versions in output binaries.
       The above issue created faulty binaries for Windows XP and it was due migration

Added: trunk/oggdsf/build/NSIS/Release/fix_manifest.cmd
===================================================================
--- trunk/oggdsf/build/NSIS/Release/fix_manifest.cmd	                        (rev 0)
+++ trunk/oggdsf/build/NSIS/Release/fix_manifest.cmd	2011-01-12 00:44:16 UTC (rev 17777)
@@ -0,0 +1,36 @@
+::---------------------------------------------------------------------------------------------------------------------------------
+:: Copyright (C) 2011 Cristian Adam
+::---------------------------------------------------------------------------------------------------------------------------------
+
+set COMPILER=VS2008
+set OLD_VERSION=9.0.30729.1
+set NEW_VERSION=9.0.30729.4148
+
+set OPENCODECS_ROOT_DIR=..\..\..
+
+ at set FILTERS=dsfFLACEncoder dsfNativeFLACSource dsfFLACDecoder
+ at set FILTERS=%FILTERS% dsfTheoraEncoder dsfTheoraDecoder
+ at set FILTERS=%FILTERS% dsfSpeexEncoder dsfSpeexDecoder
+ at set FILTERS=%FILTERS% dsfVorbisEncoder dsfVorbisDecoder
+ at set FILTERS=%FILTERS% dsfOggMux dsfOggDemux2
+ at set FILTERS=%FILTERS% vp8decoder vp8encoder
+ at set FILTERS=%FILTERS% webmmux webmsplit
+ at set FILTERS=%FILTERS% wmpinfo AxPlayer
+
+for %%i in (%FILTERS%) do (
+call:fix_binary "%OPENCODECS_ROOT_DIR%\sln\oggdsf_%COMPILER%\win32\Release\%%i.dll" 
+)
+
+for %%i in (%FILTERS%) do (
+call:fix_binary "%OPENCODECS_ROOT_DIR%\sln\oggdsf_%COMPILER%\x64\Release\%%i.dll"
+)
+
+goto:eof
+
+:fix_binary
+
+mt.exe -inputresource:%1;#2 -out:%1.manifest
+cscript.exe replace_string.js %1.manifest  %OLD_VERSION% %NEW_VERSION%
+mt.exe -outputresource:%1;#2 -manifest %1.manifest 
+
+goto:eof

Added: trunk/oggdsf/build/NSIS/Release/replace_string.js
===================================================================
--- trunk/oggdsf/build/NSIS/Release/replace_string.js	                        (rev 0)
+++ trunk/oggdsf/build/NSIS/Release/replace_string.js	2011-01-12 00:44:16 UTC (rev 17777)
@@ -0,0 +1,41 @@
+//---------------------------------------------------------------------------------------------------------------------------------
+// Copyright (C) 2011 Cristian Adam
+//---------------------------------------------------------------------------------------------------------------------------------
+var ForReading = 1, ForWriting = 2;
+
+function ReplaceStringInFile(fileName, rgExp, replaceText)
+{
+  var fso = new ActiveXObject("Scripting.FileSystemObject");
+  var file = fso.OpenTextFile(fileName, ForReading);
+  var content = file.ReadAll();
+  file.Close();
+  
+  content = content.replace(rgExp, replaceText);
+
+  try
+  {
+    fso.DeleteFile(fileName + ".bak", true);
+  }
+  catch (e)
+  {
+  }
+  fso.MoveFile(fileName, fileName + ".bak");
+
+  file = fso.OpenTextFile(fileName, ForWriting, true);
+  file.Write(content);
+  file.Close();
+}
+
+
+function main()
+{
+  if (WScript.Arguments.length != 3)
+  {
+    WScript.Echo("Usage: replace_string.js file rgExp replaceText");
+    WScript.Quit(1);
+  }
+  
+  ReplaceStringInFile(WScript.Arguments.Item(0), WScript.Arguments.Item(1), WScript.Arguments.Item(2));
+}
+
+main();
\ No newline at end of file

Modified: trunk/oggdsf/src/lib/codecs/webm/webmdshow/webmsplit/dllentry.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/webm/webmdshow/webmsplit/dllentry.cpp	2011-01-11 19:02:02 UTC (rev 17776)
+++ trunk/oggdsf/src/lib/codecs/webm/webmdshow/webmsplit/dllentry.cpp	2011-01-12 00:44:16 UTC (rev 17777)
@@ -134,9 +134,6 @@
 
     hr = DllUnregisterServer();
 
-    if (FAILED(hr))
-        return hr;
-
     hr = ComReg::RegisterCoclass(
             WebmTypes::CLSID_WebmSplit,
             friendlyname,