[Scummvm-cvs-logs] SF.net SVN: scummvm: [21860] scummvm/trunk

sev at users.sourceforge.net sev at users.sourceforge.net
Thu Apr 13 18:03:16 CEST 2006


Revision: 21860
Author:   sev
Date:     2006-04-13 18:01:43 -0700 (Thu, 13 Apr 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=21860&view=rev

Log Message:
-----------
Finish cleanup of root directory. Now move scummvm.rc to dists/

Modified Paths:
--------------
    scummvm/trunk/dists/devcpp/scummvm.dev
    scummvm/trunk/dists/msvc6/scummvm.dsp
    scummvm/trunk/dists/msvc7/scummvm.vcproj
    scummvm/trunk/dists/msvc71/scummvm.vcproj
    scummvm/trunk/dists/msvc8/scummvm.vcproj
    scummvm/trunk/tools/update-version.pl

Added Paths:
-----------
    scummvm/trunk/dists/scummvm.rc
    scummvm/trunk/dists/scummvm.rc.in

Removed Paths:
-------------
    scummvm/trunk/scummvm.rc
    scummvm/trunk/scummvm.rc.in
Modified: scummvm/trunk/dists/devcpp/scummvm.dev
===================================================================
--- scummvm/trunk/dists/devcpp/scummvm.dev	2006-04-14 00:55:37 UTC (rev 21859)
+++ scummvm/trunk/dists/devcpp/scummvm.dev	2006-04-14 01:01:43 UTC (rev 21860)
@@ -1600,7 +1600,7 @@
 BuildCmd=
 
 [Unit163]
-FileName=..\..\scummvm.rc
+FileName=..\..\dists\scummvm.rc
 CompileCpp=1
 Folder=Resources
 Compile=1

Modified: scummvm/trunk/dists/msvc6/scummvm.dsp
===================================================================
--- scummvm/trunk/dists/msvc6/scummvm.dsp	2006-04-14 00:55:37 UTC (rev 21859)
+++ scummvm/trunk/dists/msvc6/scummvm.dsp	2006-04-14 01:01:43 UTC (rev 21860)
@@ -645,7 +645,7 @@
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\scummvm.rc
+SOURCE=..\..\dists\scummvm.rc
 # End Source File
 # End Target
 # End Project

Modified: scummvm/trunk/dists/msvc7/scummvm.vcproj
===================================================================
--- scummvm/trunk/dists/msvc7/scummvm.vcproj	2006-04-14 00:55:37 UTC (rev 21859)
+++ scummvm/trunk/dists/msvc7/scummvm.vcproj	2006-04-14 01:01:43 UTC (rev 21860)
@@ -449,7 +449,7 @@
 				RelativePath="..\..\icons\scummvm.ico">
 			</File>
 			<File
-				RelativePath="..\..\scummvm.rc">
+				RelativePath="..\..\dists\scummvm.rc">
 			</File>
 		</Filter>
 		<Filter

Modified: scummvm/trunk/dists/msvc71/scummvm.vcproj
===================================================================
--- scummvm/trunk/dists/msvc71/scummvm.vcproj	2006-04-14 00:55:37 UTC (rev 21859)
+++ scummvm/trunk/dists/msvc71/scummvm.vcproj	2006-04-14 01:01:43 UTC (rev 21860)
@@ -463,7 +463,7 @@
 				RelativePath="..\..\icons\scummvm.ico">
 			</File>
 			<File
-				RelativePath="..\..\scummvm.rc">
+				RelativePath="..\..\dists\scummvm.rc">
 			</File>
 		</Filter>
 		<Filter

Modified: scummvm/trunk/dists/msvc8/scummvm.vcproj
===================================================================
--- scummvm/trunk/dists/msvc8/scummvm.vcproj	2006-04-14 00:55:37 UTC (rev 21859)
+++ scummvm/trunk/dists/msvc8/scummvm.vcproj	2006-04-14 01:01:43 UTC (rev 21860)
@@ -686,7 +686,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\scummvm.rc"
+				RelativePath="..\..\dists\scummvm.rc"
 				>
 			</File>
 		</Filter>

Copied: scummvm/trunk/dists/scummvm.rc (from rev 21859, scummvm/trunk/scummvm.rc)
===================================================================
--- scummvm/trunk/dists/scummvm.rc	                        (rev 0)
+++ scummvm/trunk/dists/scummvm.rc	2006-04-14 01:01:43 UTC (rev 21860)
@@ -0,0 +1,37 @@
+#include "winresrc.h"
+
+IDI_ICON               ICON    DISCARDABLE     "icons/scummvm.ico"
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION 0,9,0,0
+ PRODUCTVERSION 0,9,0,0
+ FILEFLAGSMASK 0x3fL
+#ifdef _DEBUG
+ FILEFLAGS 0x1L
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS 0x40004L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "Comments", "Look! A three headed monkey (TM)! .. Nice use of the TM!\0"
+            VALUE "FileDescription", "http://www.scummvm.org/\0"
+            VALUE "FileVersion", "0.9.0svn\0"
+            VALUE "InternalName", "scummvm\0"
+            VALUE "LegalCopyright", "Copyright \xA9 2001-2006 The ScummVM Team\0"
+            VALUE "LegalTrademarks", "'SCUMM', and all SCUMM games are a TM of LucasArts. Simon The Sorcerer is a TM of AdventureSoft. Beneath a Steel Sky and Broken Sword are a TM of Revolution. Flight of the Amazon Queen is a TM of John Passfield and Steve Stamatiadis. \0"
+            VALUE "OriginalFilename", "scummvm.exe\0"
+            VALUE "ProductName", "ScummVM\0"
+            VALUE "ProductVersion", "0.9.0svn\0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200
+    END
+END


Property changes on: scummvm/trunk/dists/scummvm.rc
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: scummvm/trunk/dists/scummvm.rc.in (from rev 21859, scummvm/trunk/scummvm.rc.in)
===================================================================
--- scummvm/trunk/dists/scummvm.rc.in	                        (rev 0)
+++ scummvm/trunk/dists/scummvm.rc.in	2006-04-14 01:01:43 UTC (rev 21860)
@@ -0,0 +1,37 @@
+#include "winresrc.h"
+
+IDI_ICON               ICON    DISCARDABLE     "icons/scummvm.ico"
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION @VER_MAJOR@, at VER_MINOR@, at VER_PATCH@,0
+ PRODUCTVERSION @VER_MAJOR@, at VER_MINOR@, at VER_PATCH@,0
+ FILEFLAGSMASK 0x3fL
+#ifdef _DEBUG
+ FILEFLAGS 0x1L
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS 0x40004L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "Comments", "Look! A three headed monkey (TM)! .. Nice use of the TM!\0"
+            VALUE "FileDescription", "http://www.scummvm.org/\0"
+            VALUE "FileVersion", "@VERSION@\0"
+            VALUE "InternalName", "scummvm\0"
+            VALUE "LegalCopyright", "Copyright \xA9 2001-2005 The ScummVM Team\0"
+            VALUE "LegalTrademarks", "'SCUMM', and all SCUMM games are a TM of LucasArts. Simon The Sorcerer is a TM of AdventureSoft. Beneath a Steel Sky and Broken Sword are a TM of Revolution. Flight of the Amazon Queen is a TM of John Passfield and Steve Stamatiadis. \0"
+            VALUE "OriginalFilename", "scummvm.exe\0"
+            VALUE "ProductName", "ScummVM\0"
+            VALUE "ProductVersion", "@VERSION@\0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200
+    END
+END


Property changes on: scummvm/trunk/dists/scummvm.rc.in
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: scummvm/trunk/scummvm.rc
===================================================================
--- scummvm/trunk/scummvm.rc	2006-04-14 00:55:37 UTC (rev 21859)
+++ scummvm/trunk/scummvm.rc	2006-04-14 01:01:43 UTC (rev 21860)
@@ -1,37 +0,0 @@
-#include "winresrc.h"
-
-IDI_ICON               ICON    DISCARDABLE     "icons/scummvm.ico"
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0,9,0,0
- PRODUCTVERSION 0,9,0,0
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x40004L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904b0"
-        BEGIN
-            VALUE "Comments", "Look! A three headed monkey (TM)! .. Nice use of the TM!\0"
-            VALUE "FileDescription", "http://www.scummvm.org/\0"
-            VALUE "FileVersion", "0.9.0svn\0"
-            VALUE "InternalName", "scummvm\0"
-            VALUE "LegalCopyright", "Copyright \xA9 2001-2006 The ScummVM Team\0"
-            VALUE "LegalTrademarks", "'SCUMM', and all SCUMM games are a TM of LucasArts. Simon The Sorcerer is a TM of AdventureSoft. Beneath a Steel Sky and Broken Sword are a TM of Revolution. Flight of the Amazon Queen is a TM of John Passfield and Steve Stamatiadis. \0"
-            VALUE "OriginalFilename", "scummvm.exe\0"
-            VALUE "ProductName", "ScummVM\0"
-            VALUE "ProductVersion", "0.9.0svn\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END

Deleted: scummvm/trunk/scummvm.rc.in
===================================================================
--- scummvm/trunk/scummvm.rc.in	2006-04-14 00:55:37 UTC (rev 21859)
+++ scummvm/trunk/scummvm.rc.in	2006-04-14 01:01:43 UTC (rev 21860)
@@ -1,37 +0,0 @@
-#include "winresrc.h"
-
-IDI_ICON               ICON    DISCARDABLE     "icons/scummvm.ico"
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION @VER_MAJOR@, at VER_MINOR@, at VER_PATCH@,0
- PRODUCTVERSION @VER_MAJOR@, at VER_MINOR@, at VER_PATCH@,0
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x40004L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904b0"
-        BEGIN
-            VALUE "Comments", "Look! A three headed monkey (TM)! .. Nice use of the TM!\0"
-            VALUE "FileDescription", "http://www.scummvm.org/\0"
-            VALUE "FileVersion", "@VERSION@\0"
-            VALUE "InternalName", "scummvm\0"
-            VALUE "LegalCopyright", "Copyright \xA9 2001-2005 The ScummVM Team\0"
-            VALUE "LegalTrademarks", "'SCUMM', and all SCUMM games are a TM of LucasArts. Simon The Sorcerer is a TM of AdventureSoft. Beneath a Steel Sky and Broken Sword are a TM of Revolution. Flight of the Amazon Queen is a TM of John Passfield and Steve Stamatiadis. \0"
-            VALUE "OriginalFilename", "scummvm.exe\0"
-            VALUE "ProductName", "ScummVM\0"
-            VALUE "ProductVersion", "@VERSION@\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END

Modified: scummvm/trunk/tools/update-version.pl
===================================================================
--- scummvm/trunk/tools/update-version.pl	2006-04-14 00:55:37 UTC (rev 21859)
+++ scummvm/trunk/tools/update-version.pl	2006-04-14 01:01:43 UTC (rev 21860)
@@ -31,10 +31,10 @@
 
 # List of the files in which we need to perform substitution.
 my @subs_files = qw(
-	scummvm.rc
 	base/internal_version.h
 	dists/macosx/Info.plist
 	dists/redhat/scummvm.spec
+	dists/scummvm.rc
 	);
 
 # The following files also contain version data and should possible be modified


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.





More information about the Scummvm-git-logs mailing list