nimrod -> nim in some filenames

mbaulch · Feb 14, 2015 · fb718f2 · fb718f2
1 parent ece23d3
commit fb718f2
Show file tree

Hide file tree

Showing 10 changed files with 11 additions and 147 deletions.
diff --git a/compiler/installer.ini b/compiler/installer.ini
@@ -51,10 +51,10 @@ Files: "configure;makefile"
 Files: "*.ini"
 Files: "koch.nim"
 
-Files: "icons/nimrod.ico"
-Files: "icons/nimrod.rc"
-Files: "icons/nimrod.res"
-Files: "icons/nimrod_icon.o"
+Files: "icons/nim.ico"
+Files: "icons/nim.rc"
+Files: "icons/nim.res"
+Files: "icons/nim_icon.o"
 Files: "icons/koch.ico"
 Files: "icons/koch.rc"
 Files: "icons/koch.res"

diff --git a/compiler/nim.nim b/compiler/nim.nim
@@ -9,9 +9,9 @@
 
 when defined(gcc) and defined(windows):
   when defined(x86):
-    {.link: "icons/nimrod.res".}
+    {.link: "icons/nim.res".}
   else:
-    {.link: "icons/nimrod_icon.o".}
+    {.link: "icons/nim_icon.o".}
 
 import
   commands, lexer, condsyms, options, msgs, nversion, nimconf, ropes,

diff --git a/config/nimrod.cfg b/config/nimrod.cfg
diff --git a/icons/nimrod.ico → icons/nim.ico b/icons/nimrod.ico → icons/nim.ico
diff --git a/icons/nim.rc b/icons/nim.rc
@@ -0,0 +1,3 @@
+nimicon ICON "nim.ico"
+
+
diff --git a/icons/nimrod.res → icons/nim.res b/icons/nimrod.res → icons/nim.res
diff --git a/icons/nimrod_icon.o → icons/nim_icon.o b/icons/nimrod_icon.o → icons/nim_icon.o
diff --git a/icons/nimrod.rc b/icons/nimrod.rc
diff --git a/tests/rodfiles/nimrod.cfg → tests/rodfiles/nim.cfg b/tests/rodfiles/nimrod.cfg → tests/rodfiles/nim.cfg
diff --git a/tools/niminst/nsis.tmpl b/tools/niminst/nsis.tmpl
@@ -50,8 +50,8 @@
   SetCompressor /SOLID /FINAL lzma
 
   ; Installer and Uninstaller Icons
-  ; Icon "nimrod.ico"
-  ; UninstallIcon "nimrod.ico"
+  ; Icon "nim.ico"
+  ; UninstallIcon "nim.ico"
 
   ; Set installation details to be shown by default
   ShowInstDetails show