Move distribution-related files to Dist

Also delete useless or obsolete files, as well as a binary .aps file
from Visual Studio.
Also fix .gitignore ignoring any lugaru*.* file :)

diff --git a/.gitignore b/.gitignore
index b06caa23878545817984e185c53757078cd80618..ab0ef3539b1f1cbbb657f33720aed07c23a5cf80 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -6,13 +6,14 @@ Xcode/*.xcodeproj/*.pbxuser
 build*
 *~
 .*.swp
-lugaru*
+*.aps
+lugaru
+lugaru.exe
 cmake_install.cmake
 cmake-build
 CMakeFiles
 CMakeCache.txt
 Makefile
 cscope.*
-tags
-Data/Users
+Data/users
 Data/config.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e48c32296b19d65ea4d0bd4d769f9311ba4da7bf..5f1db0f6ec5c3f8c9a6ce9fc29b982dbdccf7426 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -264,8 +264,8 @@ endif(LINUX)
 if(APPLE)
     install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/lugaru DESTINATION ${LUGARU_BINDIR})
     install(DIRECTORY ${CMAKE_SOURCE_DIR}/Data DESTINATION ${LUGARU_APP_ROOT})
-    install(FILES ${SRCDIR}/mac-res/lugaru.icns DESTINATION ${LUGARU_RESDIR})
-    install(FILES ${SRCDIR}/mac-res/Info.plist DESTINATION ${LUGARU_APP_ROOT}/Contents)
+    install(FILES ${CMAKE_SOURCE_DIR}/Dist/OSX/lugaru.icns DESTINATION ${LUGARU_RESDIR})
+    install(FILES ${CMAKE_SOURCE_DIR}/Dist/OSX/Info.plist DESTINATION ${LUGARU_APP_ROOT}/Contents)
 endif(APPLE)
 
 # Documentation

diff --git a/Dist/OSX/Info.plist b/Dist/OSX/Info.plist
new file mode 100644 (file)
index 0000000..dccd26b
--- /dev/null
+++ b/Dist/OSX/Info.plist
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+       <key>CFBundleDevelopmentRegion</key>
+       <string>English</string>
+       <key>CFBundleExecutable</key>
+       <string>lugaru</string>
+       <key>CFBundleIconFile</key>
+       <string>lugaru.icns</string>
+       <key>CFBundleIdentifier</key>
+       <string>com.wolfire.Lugaru</string>
+       <key>CFBundleInfoDictionaryVersion</key>
+       <string>6.0</string>
+       <key>CFBundleName</key>
+       <string>Lugaru: The Rabbit's Foot</string>
+       <key>CFBundlePackageType</key>
+       <string>APPL</string>
+       <key>CFBundleSignature</key>
+       <string>????</string>
+       <key>CFBundleShortVersionString</key>
+       <string>1.1</string>
+       <key>LSMinimumSystemVersion</key>
+       <string>10.5.0</string>
+       <key>CFBundleVersion</key>
+       <string>1</string>
+       <key>NSMainNibFile</key>
+       <string>MainMenu</string>
+       <key>NSPrincipalClass</key>
+       <string>NSApplication</string>
+</dict>
+</plist>

diff --git a/Dist/OSX/lugaru.icns b/Dist/OSX/lugaru.icns
new file mode 100644 (file)
index 0000000..b3c918a
Binary files /dev/null and b/Dist/OSX/lugaru.icns differ

diff --git a/Dist/lugaru.png b/Dist/lugaru.png
new file mode 100644 (file)
index 0000000..f990163
Binary files /dev/null and b/Dist/lugaru.png differ

diff --git a/Misc/lugaru-icon.psd b/Misc/lugaru-icon.psd
new file mode 100644 (file)
index 0000000..e3802af
Binary files /dev/null and b/Misc/lugaru-icon.psd differ

diff --git a/Source/mac-res/Info.plist b/Source/mac-res/Info.plist
deleted file mode 100644 (file)
index dccd26b..0000000
--- a/Source/mac-res/Info.plist
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-       <key>CFBundleDevelopmentRegion</key>
-       <string>English</string>
-       <key>CFBundleExecutable</key>
-       <string>lugaru</string>
-       <key>CFBundleIconFile</key>
-       <string>lugaru.icns</string>
-       <key>CFBundleIdentifier</key>
-       <string>com.wolfire.Lugaru</string>
-       <key>CFBundleInfoDictionaryVersion</key>
-       <string>6.0</string>
-       <key>CFBundleName</key>
-       <string>Lugaru: The Rabbit's Foot</string>
-       <key>CFBundlePackageType</key>
-       <string>APPL</string>
-       <key>CFBundleSignature</key>
-       <string>????</string>
-       <key>CFBundleShortVersionString</key>
-       <string>1.1</string>
-       <key>LSMinimumSystemVersion</key>
-       <string>10.5.0</string>
-       <key>CFBundleVersion</key>
-       <string>1</string>
-       <key>NSMainNibFile</key>
-       <string>MainMenu</string>
-       <key>NSPrincipalClass</key>
-       <string>NSApplication</string>
-</dict>
-</plist>

diff --git a/Source/mac-res/lugaru.icns b/Source/mac-res/lugaru.icns
deleted file mode 100644 (file)
index b3c918a..0000000
Binary files a/Source/mac-res/lugaru.icns and /dev/null differ

diff --git a/Source/win-res/Lugaru.aps b/Source/win-res/Lugaru.aps
deleted file mode 100644 (file)
index 91455a8..0000000
Binary files a/Source/win-res/Lugaru.aps and /dev/null differ

diff --git a/Source/win-res/Lugaru.png b/Source/win-res/Lugaru.png
deleted file mode 100644 (file)
index f990163..0000000
Binary files a/Source/win-res/Lugaru.png and /dev/null differ

diff --git a/Source/win-res/Lugaru.psd b/Source/win-res/Lugaru.psd
deleted file mode 100644 (file)
index e3802af..0000000
Binary files a/Source/win-res/Lugaru.psd and /dev/null differ

diff --git a/Source/win-res/Untitled-1.jpg b/Source/win-res/Untitled-1.jpg
deleted file mode 100644 (file)
index 8622136..0000000
Binary files a/Source/win-res/Untitled-1.jpg and /dev/null differ

diff --git a/Source/win-res/icon1.ico b/Source/win-res/icon1.ico
deleted file mode 100644 (file)
index 9d0e916..0000000
Binary files a/Source/win-res/icon1.ico and /dev/null differ

diff --git a/Source/win-res/icon2.ico b/Source/win-res/icon2.ico
deleted file mode 100644 (file)
index 659202e..0000000
Binary files a/Source/win-res/icon2.ico and /dev/null differ