Merge remote-tracking branch 'upstream/vanilla-print-sorting' into dev

.github/workflows/release.yml

@@ -9,43 +9,53 @@ on:
         default: 'main'
 
 jobs:
+  docs:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: flucoma/actions/env@v4
+        with: 
+          branch: ${{ github.event.inputs.base }}
+      - uses: flucoma/actions/docs@v4
+        with:
+          target: MAKE_SC_REF
+          branch: ${{ github.event.inputs.base }}
+
+      - uses: actions/upload-artifact@v2
+        with:
+          name: docs
+          path: build/sc_ref  
+
   macbuild:
     runs-on: macos-11
     steps:
       - uses: actions/checkout@v2
       - uses: flucoma/actions/env@v4
-        with:
-          branch: ${{ github.event.inputs.base }} 
+        with: 
+          branch: ${{ github.event.inputs.base }}
       - uses: flucoma/actions/sc@v4
 
-      - name: zip release
-        run: zip -r ../FluCoMa-SC-Mac-nightly.zip FluidCorpusManipulation
-        working-directory: install
-
-      - uses: actions/upload-artifact@v2                                                                                                                                                 
+      - uses: actions/upload-artifact@v2
         with:                                                                                                                                                                            
           name: macbuild                                                                                                                                                                 
-          path: FluCoMa-SC-Mac-"${{ needs.linuxbuild.outputs.version }}".zip
+          path: install
 
   winbuild:
     runs-on: windows-latest
     steps:
       - uses: actions/checkout@v2
       - uses: flucoma/actions/env@v4
-        with:
-          branch: ${{ github.event.inputs.base }} 
+        with: 
+          branch: ${{ github.event.inputs.base }}
       - uses: flucoma/actions/sc@v4
 
       - name: remove pdb files
         run: Remove-Item install -Recurse -Include *.pdb
 
-      - name: zip release
-        run: Compress-Archive install/FluidCorpusManipulation FluCoMa-SC-Windows-nightly.zip
+      - uses: actions/upload-artifact@v2 
 
-      - uses: actions/upload-artifact@v2                                                                                                                                                 
-        with:                                                                                                                                                                            
-          name: winbuild                                                                                                                                                                
-          path: FluCoMa-SC-Windows-"${{ needs.linuxbuild.outputs.version }}".zip
+        with: 
+          name: winbuild
+          path: install
 
   linuxbuild:
     runs-on: ubuntu-18.04
@@ -54,48 +64,73 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - uses: flucoma/actions/env@v4
-        with:
-          branch: ${{ github.event.inputs.base }} 
+        with: 
+          branch: ${{ github.event.inputs.base }}
       - uses: flucoma/actions/sc@v4
 
-      - name: zip release
-        run: zip -r ../FluCoMa-SC-Linux-nightly.zip FluidCorpusManipulation
-        working-directory: install
-        
-      - id: get-version
-        run: echo "::set-output name=version::$(cat flucoma.version.rc)"
-        working-directory: core
-
       - uses: actions/upload-artifact@v2                                                                                                                                                 
         with:                                                                                                                                                                            
           name: linuxbuild                                                                                                                                                                
-          path: FluCoMa-SC-Linux-"${{ needs.linuxbuild.outputs.version }}".zip
+          path: install
+          
+      - id: get-version
+        run: echo "::set-output name=version::$(cat flucoma.version.rc)"
+        working-directory: core
   
   release:
     runs-on: ubuntu-latest
-    needs: [macbuild, winbuild, linuxbuild]
+    needs: [macbuild, winbuild, linuxbuild, docs]
+    
     steps:
       - uses: actions/download-artifact@v2
         with:
-          name: macbuild
-          path: .
+          name: docs
+          path: docs
       
+      - uses: actions/download-artifact@v2
+        with:
+          name: macbuild
+          path: mac
+
+      - name: copy docs to mac
+        run: mkdir -p mac/FluidCorpusManipulation/HelpSource && cp -r docs/*   mac/FluidCorpusManipulation/HelpSource
+         
+      - name: compress win
+        run: zip -r ../FluCoMa-SC-Mac.zip .
+        working-directory: mac    
+
       - uses: actions/download-artifact@v2
         with:
           name: winbuild
-          path: .
+          path: win
+
+      - name: copy docs to win
+        run: mkdir -p win/FluidCorpusManipulation/HelpSource && cp -r docs/* win/FluidCorpusManipulation/HelpSource
+        
+      - name: compress win
+        run: zip -r ../FluCoMa-SC-Windows.zip .
+        working-directory: win    
 
       - uses: actions/download-artifact@v2
         with:
           name: linuxbuild
-          path: .
+
+          path: linux
+          
+      - name: copy docs to linux
+        run: mkdir -p linux/FluidCorpusManipulation/HelpSource && cp -r docs/* linux/FluidCorpusManipulation/HelpSource
+        
+      - name: compress linux
+        run: zip -r ../FluCoMa-SC-Linux.zip .
+        working-directory: linux     
 
       - name: package and upload
         uses: softprops/action-gh-release@v1
         with:
           name: ${{ needs.linuxbuild.outputs.version }}
           body: "This is a release build of the FluCoMa SuperCollider package. The build hash is ${{ github.sha }}"
-          files: FluCoMa*.zip
+          files: FluCoMa-SC-*.zip
           prerelease: true
           tag_name: ${{ needs.linuxbuild.outputs.version }}
           draft: false
+

release-packaging/HelpSource/Classes/FluidPlotter.schelp

@@ -181,7 +181,7 @@ d = ~dummy_data.value;
 // d.postln;
 ~fp = FluidPlotter(bounds:Rect(200,200,600,600),dict:d,mouseMoveAction:{
 	arg view, x, y, modifiers;
-	[view, x, y, modifiers].dopostln;
+	[view, x, y, modifiers].postln;
 	"".postln;
 },xmin:20,xmax:20000,ymin:-130,ymax:0);
 )
@@ -288,7 +288,7 @@ d = Dictionary.newFrom([
 w = Window("test",Rect(50,50,800,600)).front;
 ~fp = FluidPlotter(w,Rect(50,50,400,400),dict:d,mouseMoveAction:{
 	arg view, x, y, modifiers;
-	[view, x, y, modifiers].dopostln;
+	[view, x, y, modifiers].postln;
 	"".postln;
 },xmin:20,xmax:20000,ymin:-130,ymax:0);
 )

test/FluidPlotter_test.scd

@@ -24,7 +24,7 @@ d = ~dummy_data.value;
 // d.postln;
 ~fp = FluidPlotter(bounds:Rect(200,200,600,600),dict:d,mouseMoveAction:{
 	arg view, x, y, modifiers;
-	[view, x, y, modifiers].dopostln;
+	[view, x, y, modifiers].postln;
 	"".postln;
 },xmin:20,xmax:20000,ymin:-130,ymax:0);
 )
@@ -131,7 +131,7 @@ d = Dictionary.newFrom([
 w = Window("test",Rect(50,50,800,600)).front;
 ~fp = FluidPlotter(w,Rect(50,50,400,400),dict:d,mouseMoveAction:{
 	arg view, x, y, modifiers;
-	[view, x, y, modifiers].dopostln;
+	[view, x, y, modifiers].postln;
 	"".postln;
 },xmin:20,xmax:20000,ymin:-130,ymax:0);
 )
@@ -192,7 +192,7 @@ s.boot;
 // always be a Symbol)
 ~ds.dump({
 	arg dict;
-	// dict.at("data").dopostln;
+	// dict.at("data").postln;
 	~fp = FluidPlotter(bounds:Rect(200,200,600,600),dict:dict,mouseMoveAction:{
 		arg view, x, y, modifiers;
 		// [x,y].postln;
@@ -202,7 +202,7 @@ s.boot;
 			nearest.postln;
 			view.highlight_(nearest);
 		});
-		// [view, x, y, modifiers].dopostln;
+		// [view, x, y, modifiers].postln;
 		// "".postln;
 	});
 });