Move resource files to src/res.

tools/msvs/res is not an appropriate place.

diff --git a/node.gyp b/node.gyp
index 0aacc5fb0497ffd43737c424f2ab16b265b6a090..6ab64187cd255cb528900eb1f384eba17b6732f3 100644 (file)
--- a/node.gyp
+++ b/node.gyp
@@ -183,7 +183,7 @@
 
         [ 'OS=="win"', {
           'sources': [
-            'tools/msvs/res/node.rc',
+            'src/res/node.rc',
           ],
           'defines': [
             'FD_SETSIZE=1024',

diff --git a/src/res/node.ico b/src/res/node.ico
new file mode 100644 (file)
index 0000000..a2e03bb
Binary files /dev/null and b/src/res/node.ico differ

diff --git a/src/res/node.rc b/src/res/node.rc
new file mode 100644 (file)
index 0000000..0bdb2a0
--- /dev/null
+++ b/src/res/node.rc
@@ -0,0 +1,67 @@
+// Copyright Joyent, Inc. and other Node contributors.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to permit
+// persons to whom the Software is furnished to do so, subject to the
+// following conditions:
+//
+// The above copyright notice and this permission notice shall be included
+// in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+// USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+#include "winresrc.h"
+#include "node_version.h"
+
+
+// Application icon
+1 ICON node.ico
+
+
+// Version resource
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION NODE_MAJOR_VERSION,NODE_MINOR_VERSION,NODE_PATCH_VERSION,0
+ PRODUCTVERSION NODE_MAJOR_VERSION,NODE_MINOR_VERSION,NODE_PATCH_VERSION,0
+ FILEFLAGSMASK 0x3fL
+#ifdef _DEBUG
+ FILEFLAGS VS_FF_DEBUG
+#else
+#  ifdef NODE_VERSION_IS_RELEASE
+    FILEFLAGS 0x0L
+#  else
+    FILEFLAGS VS_FF_PRERELEASE
+#  endif
+#endif
+
+ FILEOS VOS_NT_WINDOWS32
+ FILETYPE VFT_APP
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "CompanyName", "Joyent, Inc"
+            VALUE "ProductName", "Node.js"
+            VALUE "FileDescription", "Evented I/O for V8 JavaScript"
+            VALUE "FileVersion", NODE_VERSION_STRING
+            VALUE "ProductVersion", NODE_VERSION_STRING
+            VALUE "OriginalFilename", "node.exe"
+            VALUE "InternalName", "node"
+            VALUE "LegalCopyright", "Copyright Joyent, Inc. and other Node contributors. MIT license."
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200
+    END
+END

diff --git a/tools/msvs/res/node.ico b/tools/msvs/res/node.ico
deleted file mode 100644 (file)
index a2e03bb..0000000
Binary files a/tools/msvs/res/node.ico and /dev/null differ

diff --git a/tools/msvs/res/node.rc b/tools/msvs/res/node.rc
deleted file mode 100644 (file)
index 0bdb2a0..0000000
--- a/tools/msvs/res/node.rc
+++ /dev/null
@@ -1,67 +0,0 @@
-// Copyright Joyent, Inc. and other Node contributors.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to permit
-// persons to whom the Software is furnished to do so, subject to the
-// following conditions:
-//
-// The above copyright notice and this permission notice shall be included
-// in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
-// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
-// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
-// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
-// USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-#include "winresrc.h"
-#include "node_version.h"
-
-
-// Application icon
-1 ICON node.ico
-
-
-// Version resource
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION NODE_MAJOR_VERSION,NODE_MINOR_VERSION,NODE_PATCH_VERSION,0
- PRODUCTVERSION NODE_MAJOR_VERSION,NODE_MINOR_VERSION,NODE_PATCH_VERSION,0
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS VS_FF_DEBUG
-#else
-#  ifdef NODE_VERSION_IS_RELEASE
-    FILEFLAGS 0x0L
-#  else
-    FILEFLAGS VS_FF_PRERELEASE
-#  endif
-#endif
-
- FILEOS VOS_NT_WINDOWS32
- FILETYPE VFT_APP
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904b0"
-        BEGIN
-            VALUE "CompanyName", "Joyent, Inc"
-            VALUE "ProductName", "Node.js"
-            VALUE "FileDescription", "Evented I/O for V8 JavaScript"
-            VALUE "FileVersion", NODE_VERSION_STRING
-            VALUE "ProductVersion", NODE_VERSION_STRING
-            VALUE "OriginalFilename", "node.exe"
-            VALUE "InternalName", "node"
-            VALUE "LegalCopyright", "Copyright Joyent, Inc. and other Node contributors. MIT license."
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END