Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
sletz committed Apr 5, 2019
2 parents e2db659 + 2da0217 commit fdb68d1
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 2 deletions.
4 changes: 4 additions & 0 deletions Build/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -52,11 +52,15 @@ update:
package:
$(MAKE) -C ../package

dist:
$(MAKE) -C ../package dist

release:
git pull --rebase
$(MAKE) clean
$(MAKE)
$(MAKE) package DEST=$(DEST)
$(MAKE) dist DISTDEST=$(DEST)

windows:
@echo Compiling on Windows MSYS might work but has not been tested.
Expand Down
2 changes: 2 additions & 0 deletions Build/rsrc/FaustLiveInfo.plist
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@
<string>2.5.2</string>
<key>CFBundleVersion</key>
<string>2.5.2</string>
<key>NSMicrophoneUsageDescription</key>
<string>FaustLive input signal</string>
<key>NSHumanReadableCopyright</key>
<string>Copyright 2009-2019 Grame</string>
<key>NSHighResolutionCapable</key>
Expand Down
6 changes: 4 additions & 2 deletions package/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ FLDIR := ../Build/FaustLive
NAME := FaustLive-$(VERSION)
CHGELOG := ../changelog.txt
DEST ?= .
DISTDEST ?= package

all:
$(MAKE) $(TARGET)
Expand All @@ -27,13 +28,14 @@ help:
@echo "Available targets are:"
@echo " macos"
@echo " windows"
@echo " dist"

macos: FLIBS := $(otool -L build/$(NAME)/FaustLive.app/Contents/MacOS/FaustLive | grep lib | grep -i faust | sed -e 's/dylib..*/dylib/' | sed -e 's/.rpath.//')
macos: build README.html
macdeployqt $(FLDIR)/FaustLive.app
cd build && cmake ..
cd build && make install
hdiutil create $(DEST)/)$(NAME)-osx.dmg -fs HFS+ -srcfolder build/$(NAME) -format UDBZ -ov
hdiutil create $(DEST)/$(NAME)-osx.dmg -fs HFS+ -srcfolder build/$(NAME) -format UDBZ -ov

windows: README.html
@echo Run the makepgk.bat script
Expand Down Expand Up @@ -64,7 +66,7 @@ dist :
# Grab the submodules.
cd ../$(dist) && rm -rf $(submodule) && git -C ../$(submodule) archive --format=tar --prefix=$(submodule) HEAD | tar xf -
# Create the source tarball.
cd .. && tar cfz package/$(dist).tar.gz $(dist)
cd .. && tar cfz $(DISTDEST)/$(dist).tar.gz $(dist)
rm -rf ../$(dist)


Expand Down

0 comments on commit fdb68d1

Please sign in to comment.