Skip to content

Commit

Permalink
Update Info.plist template and remove unsigning
Browse files Browse the repository at this point in the history
  • Loading branch information
codingjoe committed Jul 31, 2017
1 parent 8eefcb2 commit df6629b
Show file tree
Hide file tree
Showing 3 changed files with 30 additions and 24 deletions.
34 changes: 20 additions & 14 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,29 +1,35 @@
VERSION ?= $(shell git describe --tags)

.PHONY: clean release

release:
mkdir -p builds/
echo $(version) > builds/LATEST

# Mac OS X
cp MusicBeam/sketch.icns MusicBeam/application.macosx/MusicBeam.app/Contents/Resources/sketch.icns
defaults write $(pwd)MusicBeam/application.macosx/MusicBeam.app/Contents/Info.plist LSUIPresentationMode -int 4
-codesign --remove-signature $(pwd)MusicBeam/application.macosx/MusicBeam.app
(cd MusicBeam/application.macosx/ && zip -rq ../../builds/MusicBeam-v$(version)-macosx.zip *)
zip -q builds/MusicBeam-v$(version)-macosx.zip LICENSE README.md
(cd MusicBeam/application.macosx/ && zip -rq ../../builds/MusicBeam-v$(VERSION)-macosx.zip *)
zip -q builds/MusicBeam-v$(VERSION)-macosx.zip LICENSE README.md

# Win32
(cd MusicBeam/application.windows32/ && zip -rq ../../builds/MusicBeam-v$(version)-windows32.zip *)
zip -q builds/MusicBeam-v$(version)-windows32.zip LICENSE README.md
(cd MusicBeam/application.windows32/ && zip -rq ../../builds/MusicBeam-v$(VERSION)-windows32.zip *)
zip -q builds/MusicBeam-v$(VERSION)-windows32.zip LICENSE README.md

# Win64
(cd MusicBeam/application.windows64/ && zip -rq ../../builds/MusicBeam-v$(version)-windows64.zip *)
zip -q builds/MusicBeam-v$(version)-windows64.zip LICENSE README.md
(cd MusicBeam/application.windows64/ && zip -rq ../../builds/MusicBeam-v$(VERSION)-windows64.zip *)
zip -q builds/MusicBeam-v$(VERSION)-windows64.zip LICENSE README.md

# Linux i386
(cd MusicBeam/application.linux32/ && zip -rq ../../builds/MusicBeam-v$(version)-linux32.zip *)
zip -q builds/MusicBeam-v$(version)-linux32.zip LICENSE README.md
(cd MusicBeam/application.linux32/ && zip -rq ../../builds/MusicBeam-v$(VERSION)-linux32.zip *)
zip -q builds/MusicBeam-v$(VERSION)-linux32.zip LICENSE README.md

# Linux x86_64
(cd MusicBeam/application.linux64/ && zip -rq ../../builds/MusicBeam-v$(version)-linux64.zip *)
zip -q builds/MusicBeam-v$(version)-linux64.zip LICENSE README.md
(cd MusicBeam/application.linux64/ && zip -rq ../../builds/MusicBeam-v$(VERSION)-linux64.zip *)
zip -q builds/MusicBeam-v$(VERSION)-linux64.zip LICENSE README.md

clean:
rm -rf ./MusicBeam/appliaction.* ./builds/
rm -rf ./MusicBeam/application.*
rm -rf ./builds/

test:
read -e -p "Enter Your Name:" NAME
echo $$NAME
10 changes: 5 additions & 5 deletions MusicBeam/Info.plist.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@

<!-- Customize this set as you wish -->
<key>CFBundleShortVersionString</key>
<string>2.2.0</string>
<string>2.3.0</string>
<key>CFBundleVersion</key>
<string>2.2.0</string>
<string>2.3.0</string>
<key>CFBundleSignature</key>
<string>com.codingjoe.MusicBeam</string>
<key>NSHumanReadableCopyright</key>
<string>2012 — 2016 Johannes Hoppe</string>
<string>2012 — 2017 Johannes Hoppe</string>
<key>CFBundleGetInfoString</key>
<string>Your open source light show!</string>
<!-- End of the set that can be customized -->
Expand All @@ -38,7 +38,7 @@
<string>@@sketch@@</string>

<key>LSMinimumSystemVersion</key>
<string>10.7.3</string>
<string>10.8.5</string>

<key>NSHighResolutionCapable</key>
<true/>
Expand All @@ -55,7 +55,7 @@
</dict>

<key>LSUIPresentationMode</key>
<integer>@@lsuipresentationmode@@</integer>
<integer>4</integer>

<key>JVMOptions</key>
<array>
Expand Down
10 changes: 5 additions & 5 deletions MusicBeam/MusicBeam.pde
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import controlP5.*;
import ddf.minim.*;
import ddf.minim.analysis.*;

String version = "2.2.1";
String version = "2.3.0";

public Boolean debugMode = false;

Expand Down Expand Up @@ -345,16 +345,16 @@ private void initAudioInput()
String msg = "No audio input found!\n\n"
+ "Please check the audio settings on your current operating system.\n"
+ "There must be at least one audio input activated.";

minim = new Minim(this);
in = minim.getLineIn(Minim.STEREO, 512);

if(in == null)
{
JOptionPane.showMessageDialog(null, msg, "Device detection", JOptionPane.ERROR_MESSAGE);
System.exit(1);
}

bdFreq = new BeatDetect(in.bufferSize(), in.sampleRate());
bdSound = new BeatDetect();
}
}

0 comments on commit df6629b

Please sign in to comment.