Merge branch 'versioning' into master

nwolek · Mar 29, 2016 · 6a2a84a · 6a2a84a
2 parents a8dc0cf + 9c52967
commit 6a2a84a
Show file tree

Hide file tree

Showing 38 changed files with 62 additions and 18 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -12,6 +12,13 @@ execute_process(
 )
 
 
+# Update version numbers based on the latest git tag to the repository
+if (EXISTS "${CMAKE_CURRENT_LIST_DIR}/package-info.json.in")
+	include(${CMAKE_CURRENT_SOURCE_DIR}/source/max-sdk-core/script/git-rev.cmake)
+	message("Building _____ ${GIT_TAG} _____")
+	configure_file("${CMAKE_CURRENT_LIST_DIR}/package-info.json.in" "${CMAKE_CURRENT_LIST_DIR}/package-info.json" @ONLY)
+endif ()
+
 # Macro from http://stackoverflow.com/questions/7787823/cmake-how-to-get-the-name-of-all-subdirectories-of-a-directory
 MACRO(SUBDIRLIST result curdir)
   FILE(GLOB children RELATIVE ${curdir} ${curdir}/*)
@@ -28,6 +35,8 @@ ENDMACRO()
 # Now build every project using the macro above
 SUBDIRLIST(PROJECT_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/source/projects)
 foreach(project_dir ${PROJECT_DIRS})
-	MESSAGE("Generating: ${project_dir}")
-	add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/source/projects/${project_dir})
+	if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/source/projects/${project_dir}/CMakeLists.txt")
+		message("Generating: ${project_dir}")
+		add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/source/projects/${project_dir})
+	endif()
 endforeach()
diff --git a/appveyor.yml b/appveyor.yml
@@ -1,5 +1,3 @@
-version: '1.1.beta-{build}'
-
 environment:
   CMAKE_PATH: $(APPVEYOR_BUILD_FOLDER)\cmake-3.4.1-win32-x86
   VS_VERSION: "Visual Studio 12"

diff --git a/externals/nw.cppan~.mxe b/externals/nw.cppan~.mxe
diff --git a/externals/nw.cppan~.mxe64 b/externals/nw.cppan~.mxe64
diff --git a/externals/nw.cppan~.mxo/Contents/Info.plist b/externals/nw.cppan~.mxo/Contents/Info.plist
@@ -25,7 +25,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string></string>
+	<string>1.1.beta2</string>
 	<key>CSResourcesFileMapped</key>
 	<true/>
 	<key>LSRequiresCarbon</key>

diff --git a/externals/nw.gateplus~.mxe b/externals/nw.gateplus~.mxe
diff --git a/externals/nw.gateplus~.mxe64 b/externals/nw.gateplus~.mxe64
diff --git a/externals/nw.gateplus~.mxo/Contents/Info.plist b/externals/nw.gateplus~.mxo/Contents/Info.plist
@@ -25,7 +25,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string></string>
+	<string>1.1.beta2</string>
 	<key>CSResourcesFileMapped</key>
 	<true/>
 	<key>LSRequiresCarbon</key>

diff --git a/externals/nw.grainbang~.mxe b/externals/nw.grainbang~.mxe
diff --git a/externals/nw.grainbang~.mxe64 b/externals/nw.grainbang~.mxe64
diff --git a/externals/nw.grainbang~.mxo/Contents/Info.plist b/externals/nw.grainbang~.mxo/Contents/Info.plist
@@ -25,7 +25,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string></string>
+	<string>1.1.beta2</string>
 	<key>CSResourcesFileMapped</key>
 	<true/>
 	<key>LSRequiresCarbon</key>

diff --git a/externals/nw.grainphase~.mxe b/externals/nw.grainphase~.mxe
diff --git a/externals/nw.grainphase~.mxe64 b/externals/nw.grainphase~.mxe64
diff --git a/externals/nw.grainphase~.mxo/Contents/Info.plist b/externals/nw.grainphase~.mxo/Contents/Info.plist
@@ -25,7 +25,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string></string>
+	<string>1.1.beta2</string>
 	<key>CSResourcesFileMapped</key>
 	<true/>
 	<key>LSRequiresCarbon</key>

diff --git a/externals/nw.grainpulse~.mxe b/externals/nw.grainpulse~.mxe
diff --git a/externals/nw.grainpulse~.mxe64 b/externals/nw.grainpulse~.mxe64
diff --git a/externals/nw.grainpulse~.mxo/Contents/Info.plist b/externals/nw.grainpulse~.mxo/Contents/Info.plist
@@ -25,7 +25,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string></string>
+	<string>1.1.beta2</string>
 	<key>CSResourcesFileMapped</key>
 	<true/>
 	<key>LSRequiresCarbon</key>

diff --git a/externals/nw.grainstream~.mxe b/externals/nw.grainstream~.mxe
diff --git a/externals/nw.grainstream~.mxe64 b/externals/nw.grainstream~.mxe64
diff --git a/externals/nw.grainstream~.mxo/Contents/Info.plist b/externals/nw.grainstream~.mxo/Contents/Info.plist
@@ -25,7 +25,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string></string>
+	<string>1.1.beta2</string>
 	<key>CSResourcesFileMapped</key>
 	<true/>
 	<key>LSRequiresCarbon</key>

diff --git a/externals/nw.gverb~.mxe b/externals/nw.gverb~.mxe
diff --git a/externals/nw.gverb~.mxe64 b/externals/nw.gverb~.mxe64
diff --git a/externals/nw.gverb~.mxo/Contents/Info.plist b/externals/nw.gverb~.mxo/Contents/Info.plist
@@ -25,7 +25,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string></string>
+	<string>1.1.beta2</string>
 	<key>CSResourcesFileMapped</key>
 	<true/>
 	<key>LSRequiresCarbon</key>

diff --git a/externals/nw.phasorshift~.mxe b/externals/nw.phasorshift~.mxe
diff --git a/externals/nw.phasorshift~.mxe64 b/externals/nw.phasorshift~.mxe64
diff --git a/externals/nw.phasorshift~.mxo/Contents/Info.plist b/externals/nw.phasorshift~.mxo/Contents/Info.plist
@@ -25,7 +25,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string></string>
+	<string>1.1.beta2</string>
 	<key>CSResourcesFileMapped</key>
 	<true/>
 	<key>LSRequiresCarbon</key>

diff --git a/externals/nw.pulsesamp~.mxe b/externals/nw.pulsesamp~.mxe
diff --git a/externals/nw.pulsesamp~.mxe64 b/externals/nw.pulsesamp~.mxe64
diff --git a/externals/nw.pulsesamp~.mxo/Contents/Info.plist b/externals/nw.pulsesamp~.mxo/Contents/Info.plist
@@ -25,7 +25,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string></string>
+	<string>1.1.beta2</string>
 	<key>CSResourcesFileMapped</key>
 	<true/>
 	<key>LSRequiresCarbon</key>

diff --git a/externals/nw.recordplus~.mxe b/externals/nw.recordplus~.mxe
diff --git a/externals/nw.recordplus~.mxe64 b/externals/nw.recordplus~.mxe64
diff --git a/externals/nw.recordplus~.mxo/Contents/Info.plist b/externals/nw.recordplus~.mxo/Contents/Info.plist
@@ -25,7 +25,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string></string>
+	<string>1.1.beta2</string>
 	<key>CSResourcesFileMapped</key>
 	<true/>
 	<key>LSRequiresCarbon</key>

diff --git a/externals/nw.trainshift~.mxe b/externals/nw.trainshift~.mxe
diff --git a/externals/nw.trainshift~.mxe64 b/externals/nw.trainshift~.mxe64
diff --git a/externals/nw.trainshift~.mxo/Contents/Info.plist b/externals/nw.trainshift~.mxo/Contents/Info.plist
@@ -25,7 +25,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string></string>
+	<string>1.1.beta2</string>
 	<key>CSResourcesFileMapped</key>
 	<true/>
 	<key>LSRequiresCarbon</key>

diff --git a/package-info.json b/package-info.json
@@ -22,12 +22,12 @@
 	}
 ,
 	"tags" : [ "granular", "sampling", "reverb", "zero-crossings" ],
-	"version" : "1.1.beta",
+	"version" : "1.1.beta2",
 	"website" : "http://www.nathanwolek.com",
 	"filelist" : 	{
 		"externals" : [ "nw.cppan~.mxo", "nw.gateplus~.mxo", "nw.grainbang~.mxo", "nw.grainphase~.mxo", "nw.grainpulse~.mxo", "nw.grainstream~.mxo", "nw.gverb~.mxo", "nw.phasorshift~.mxo", "nw.pulsesamp~.mxo", "nw.recordplus~.mxo", "nw.trainshift~.mxo" ],
 		"patchers" : [ "buffer-scrub-demo.maxpat", "gate-comparison.maxpat", "module_demo/g_2voice/g_2voice.model.maxhelp", "module_demo/g_2voice/g_2voice.model.maxpat", "module_demo/g_2voice/g_2voice.model.presets.txt", "module_demo/g_2voice/g_2voice.module.maxpat", "module_demo/g_2voice/g_2voice.view.maxpat", "module_demo/readme.md", "record-comparison.maxpat", "reverb-mix-demo.maxpat", "time-stretch-demo.maxpat" ],
-		"help" : [ "nw.cppan~.maxhelp", "nw.cycle.maxhelp", "nw.gateplus~.maxhelp", "nw.grainbang~.maxhelp", "nw.grainphase~.maxhelp", "nw.grainpulse~.maxhelp", "nw.grainstream~.maxhelp", "nw.gverb~.maxhelp", "nw.phasorshift~.maxhelp", "nw.pulsesamp~.maxhelp", "nw.recordplus~.maxhelp", "nw.trainshift~.maxhelp" ],
+		"help" : [ "nw.cppan~.maxhelp", "nw.gateplus~.maxhelp", "nw.grainbang~.maxhelp", "nw.grainphase~.maxhelp", "nw.grainpulse~.maxhelp", "nw.grainstream~.maxhelp", "nw.gverb~.maxhelp", "nw.phasorshift~.maxhelp", "nw.pulsesamp~.maxhelp", "nw.recordplus~.maxhelp", "nw.trainshift~.maxhelp" ],
 		"media" : [ "grain_windows/3stage-linear_30.aiff", "grain_windows/3stage-linear_50.aiff", "grain_windows/blackman-harris.aiff", "grain_windows/blackman.aiff", "grain_windows/expodec.aiff", "grain_windows/gauss.aiff", "grain_windows/hamming.aiff", "grain_windows/hanning.aiff", "grain_windows/quasi-gauss_30.aiff", "grain_windows/quasi-gauss_50.aiff", "grain_windows/rexpodec.aiff", "grain_windows/triangle.aiff" ],
 		"docs" : [ "nw.cppan~.maxref.xml", "nw.gateplus~.maxref.xml", "nw.grainbang~.maxref.xml", "nw.grainphase~.maxref.xml", "nw.grainpulse~.maxref.xml", "nw.grainstream~.maxref.xml", "nw.gverb~.maxref.xml", "nw.phasorshift~.maxref.xml", "nw.pulsesamp~.maxref.xml", "nw.recordplus~.maxref.xml", "nw.trainshift~.maxref.xml" ],
 		"javascript" : [ "nw.cycle.js" ],

diff --git a/package-info.json.in b/package-info.json.in
@@ -0,0 +1,37 @@
+{
+	"author" : "Nathan Wolek",
+	"authors" : [  ],
+	"description" : "Contains updated objects from the Granular Toolkit, a classic stereo reverb and some twists on standard MSP objects that makes them savvy about zero-crossings. ",
+	"displayname" : "",
+	"extends" : "",
+	"extensible" : 0,
+	"homepatcher" : "LowkeyNW-Overview.maxpat",
+	"max_version_max" : "7.2",
+	"max_version_min" : "6.1",
+	"name" : "LowkeyNW",
+	"os" : 	{
+		"macintosh" : 		{
+			"platform" : [ "x64" ],
+			"min_version" : "10.7.x"
+		}
+,
+		"windows" : 		{
+
+		}
+
+	}
+,
+	"tags" : [ "granular", "sampling", "reverb", "zero-crossings" ],
+	"version" : "@GIT_VERSION_MAJ@.@GIT_VERSION_MIN@.@GIT_VERSION_SUB@",
+	"website" : "http://www.nathanwolek.com",
+	"filelist" : 	{
+		"externals" : [ "nw.cppan~.mxo", "nw.gateplus~.mxo", "nw.grainbang~.mxo", "nw.grainphase~.mxo", "nw.grainpulse~.mxo", "nw.grainstream~.mxo", "nw.gverb~.mxo", "nw.phasorshift~.mxo", "nw.pulsesamp~.mxo", "nw.recordplus~.mxo", "nw.trainshift~.mxo" ],
+		"patchers" : [ "buffer-scrub-demo.maxpat", "gate-comparison.maxpat", "module_demo/g_2voice/g_2voice.model.maxhelp", "module_demo/g_2voice/g_2voice.model.maxpat", "module_demo/g_2voice/g_2voice.model.presets.txt", "module_demo/g_2voice/g_2voice.module.maxpat", "module_demo/g_2voice/g_2voice.view.maxpat", "module_demo/readme.md", "record-comparison.maxpat", "reverb-mix-demo.maxpat", "time-stretch-demo.maxpat" ],
+		"help" : [ "nw.cppan~.maxhelp", "nw.gateplus~.maxhelp", "nw.grainbang~.maxhelp", "nw.grainphase~.maxhelp", "nw.grainpulse~.maxhelp", "nw.grainstream~.maxhelp", "nw.gverb~.maxhelp", "nw.phasorshift~.maxhelp", "nw.pulsesamp~.maxhelp", "nw.recordplus~.maxhelp", "nw.trainshift~.maxhelp" ],
+		"media" : [ "grain_windows/3stage-linear_30.aiff", "grain_windows/3stage-linear_50.aiff", "grain_windows/blackman-harris.aiff", "grain_windows/blackman.aiff", "grain_windows/expodec.aiff", "grain_windows/gauss.aiff", "grain_windows/hamming.aiff", "grain_windows/hanning.aiff", "grain_windows/quasi-gauss_30.aiff", "grain_windows/quasi-gauss_50.aiff", "grain_windows/rexpodec.aiff", "grain_windows/triangle.aiff" ],
+		"docs" : [ "nw.cppan~.maxref.xml", "nw.gateplus~.maxref.xml", "nw.grainbang~.maxref.xml", "nw.grainphase~.maxref.xml", "nw.grainpulse~.maxref.xml", "nw.grainstream~.maxref.xml", "nw.gverb~.maxref.xml", "nw.phasorshift~.maxref.xml", "nw.pulsesamp~.maxref.xml", "nw.recordplus~.maxref.xml", "nw.trainshift~.maxref.xml" ],
+		"javascript" : [ "nw.cycle.js" ],
+		"extras" : [ "LowkeyNW-Overview.maxpat" ]
+	}
+
+}
diff --git a/source/max-sdk-core b/source/max-sdk-core