Merge pull request #320 from calband/prep_v3.6.0

Prep v3.6.0

Author: rmpowell77

CMakeLists.txt

@@ -177,22 +177,13 @@ file (
 
 file (
   GLOB CalChartResources
-    "${CMAKE_CURRENT_SOURCE_DIR}/resources/*.xbm"
-    "${CMAKE_CURRENT_SOURCE_DIR}/resources/*.icns"
-    "${CMAKE_CURRENT_SOURCE_DIR}/resources/*.ico"
-    "${CMAKE_CURRENT_SOURCE_DIR}/resources/*.png"
-  )
-
-file (
-  GLOB CalChartImages
-    "${CMAKE_CURRENT_SOURCE_DIR}/resources/image/*"
+    "${CMAKE_CURRENT_SOURCE_DIR}/resources/*"
   )
 
 source_group(
   "Resources" FILES
   ${CalChartDocs}
   ${CalChartResources}
-  ${CalChartImages}
   )
 
 add_executable (
@@ -201,7 +192,6 @@ add_executable (
   ${CalChartHeaders}
   ${CalChartDocs}
   ${CalChartResources}
-  ${CalChartImages}
   "${CMAKE_CURRENT_SOURCE_DIR}/calchart.rc"
   )
 
@@ -212,7 +202,7 @@ install (
   )
 
 
-set(AllResources ${CalChartDocs} ${CalChartResources} ${CalChartImages}) 
+set(AllResources ${CalChartDocs} ${CalChartResources}) 
 
 set_target_properties (
   CalChart PROPERTIES
@@ -284,7 +274,7 @@ set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /SUBSYSTEM:WINDOWS")
 add_custom_command (
   TARGET CalChart POST_BUILD
   COMMAND ${CMAKE_COMMAND} -E copy_directory
-  "${CMAKE_CURRENT_SOURCE_DIR}/resources/" $<TARGET_FILE_DIR:CalChart>
+  "${CMAKE_CURRENT_SOURCE_DIR}/resources" $<TARGET_FILE_DIR:CalChart>/resources
   )
 
 add_custom_command (
@@ -306,9 +296,9 @@ install (
   )
 
 install (
-  FILES ${CalChartImages}
-  DESTINATION image
-  COMPONENT Images
+  FILES ${CalChartResources}
+  DESTINATION resources
+  COMPONENT Resources
   )
 
 # Installer section
@@ -320,7 +310,7 @@ include (InstallRequiredSystemLibraries)
 set (CPACK_PACKAGE_NAME CalChart)
 set (CPACK_ARCHIVE_COMPONENT_INSTALL ON)
 if (MSVC)
-  set (CPACK_COMPONENTS_ALL applications Docs Images)
+  set (CPACK_COMPONENTS_ALL applications Docs Resources)
 else ()
   set (CPACK_COMPONENTS_ALL applications)
 endif ()

README.md

@@ -8,7 +8,7 @@ Checklist
 
 How to release calchart:
 
-The current calchart version is 3.5.4.  In all commands below, substitute that number for $CCVER (meaning when you read $CCVER, type 3.5.4)
+The current calchart version is 3.6.0.  In all commands below, substitute that number for $CCVER (meaning when you read $CCVER, type 3.6.0)
 
 0.1 Increment the CalChart_VERSION in CMakeLists.txt to CCVER
 
@@ -24,15 +24,15 @@ For windows:
 w1.1 Follow the instructions in README-win.txt
 
 w1.1.1 Copy readme to build-win:
-awk 'sub("$", "\r")' README.md > build-win/README.txt
+awk 'sub("$", "\r")' README.md > build-windows/README.txt
 
 w1.2 Install Nullsoft Scriptable Install System
 We've configured CMake to use NSIS to do installations.
 https://sourceforge.net/projects/nsis/
 
 w1.3 Build the setup.exe installer:
   Compile the ALL_BUILD target for Release by selecting the ALL_BUILD in the CMakePredefinedTargets and Build->Build ALL_BUILD.
-  Compile the INSTALL target for Release by selecting the INSTALL in the CMakePredefinedTargets and Build->Build INSTALL.
+  Compile the INSTALL target for Release by selecting the PACKAGE in the CMakePredefinedTargets and Build->Build PACKAGE.
 
 The final product is CalChart-$CCVER.exe
 
@@ -58,14 +58,14 @@ The final product is build/CalChart-$CCVER.dmg
 ---
 
 2. Tag the depot
-$ git tag -a v3.5.4 -m "calchart-3.5.4"
-$ git push origin v3.5.4
+$ git tag -a v3.6.0 -m "calchart-3.6.0"
+$ git push origin v3.6.0
 
 3. Go to a temporary directory on your system to recheck at the tag.  This is to avoid having any unwanted files
 $ cd /tmp
 $ git clone --recursive https://github.com/calband/calchart.git calchart
 $ cd calchart
-$ git checkout v3.5.4
+$ git checkout v3.6.0
 
 4. Rebuild the release now that you have the tag (repeat instructions for step 1)