History

add linux-all to makefile; house cleaning

Ge Wang committed 3 years ago

Commit c15ed091 parent 6cc09604 files · +57 −33Browse files

Unified · Split

4 files
  1. VERSIONS +8 −0
  2. examples/README +19 −3
  3. src/core/makefile +7 −11
  4. src/makefile +23 −19
VERSIONS+8−0
@@ -4,10 +4,18 @@ ChucK VERSIONS log · 3 unmodified lines
4 4
51.5.0.351.5.0.3
6---6---
7- (note) this is (also) a maintenance release; please see 1.5.0.1
8 and earlier release notes to see recent feature updates
7- (fixed) chuck audio I/O now correctly carries out extended probing9- (fixed) chuck audio I/O now correctly carries out extended probing
8 for default input and output devices with differing sample rates,10 for default input and output devices with differing sample rates,
9 e.g., with some bluetooth mic/headphones whose input is limited11 e.g., with some bluetooth mic/headphones whose input is limited
10 to 24kHZ, including some AirPods.12 to 24kHZ, including some AirPods.
13- (updated) examples/README now has more useful information
14- (updated) README.md streamlined and linux build instructions improved.
15- (updated, developer) `make linux-all` (or simply `make linux`) now
16 builds all supported drivers (e.g., ALSA, PulseAudio, JACK); this is
17 equivalent in outcome to `make linux-alsa linux-pulse linux-jack`
18- (updated, developer) makefile streamlined
11 19
12 20
131.5.0.2 (June 2023)211.5.0.2 (June 2023)
examples/README+19−3
@@ -1,3 +1,19 @@
1http://chuck.stanford.edu/doc/examples/1ChucK Class Library Reference
2http://chuck.cs.princeton.edu/doc/examples/2 https://chuck.stanford.edu/doc/reference/
3http://ccrma.stanford.edu/software/chuck/3 https://chuck.cs.princeton.edu/doc/reference/
4
5examples organized by topic
6 https://chuck.stanford.edu/doc/examples/
7 https://chuck.cs.princeton.edu/doc/examples/
8
9ChucK Documentation (tutorials, language specification, etc.)
10 https://chuck.stanford.edu/doc/
11 https://chuck.cs.princeton.edu/doc/
12
13Join the Community (seek/give help; share work)
14 https://chuck.stanford.edu/community/
15 https://chuck.cs.princeton.edu/community/
16
17Many other things ChucK
18 https://chuck.stanford.edu/
19 https://chuck.cs.princeton.edu/
src/core/makefile+7−11
@@ -1,11 +1,11 @@
1# default target: print usage message and quit1# default target: print usage message and quit
2current:2current:
3 @echo "[chuck build]: please use one of the following configurations:"3 @echo "[chuck build]: please use one of the following configurations:"
4 @echo " make linux-alsa, make linux-jack, make linux-pulse,"4 @echo " make linux-alsa, make linux-jack, make linux-pulse, linux-all,"
5 @echo " make mac, make mac-ub, make cygwin, or make win32"5 @echo " make mac, make mac-ub, make cygwin, or make win32"
6 6
7.PHONY: mac mac-ub osx linux-pulse linux-jack linux-alsa cygwin osx-rl test7.PHONY: mac mac-ub osx linux-all linux linux-pulse linux-jack linux-alsa cygwin osx-rl test
8mac mac-ub osx linux-pulse linux-jack linux-alsa cygwin osx-rl: chuck-core8mac mac-ub osx linux-all linux linux-pulse linux-jack linux-alsa cygwin osx-rl: chuck-core
9 9
10win32:10win32:
11 make -f makefile.win3211 make -f makefile.win32
@@ -48,6 +48,10 @@ ifneq (,$(strip $(filter mac mac-ub osx bin-dist-mac,$(MAKECMDGOALS)))) · 36 unmodified lines
48include makefile.x/makefile.mac48include makefile.x/makefile.mac
49endif49endif
50 50
51ifneq (,$(strip $(filter linux linux-all,$(MAKECMDGOALS))))
52include makefile.x/makefile.linux
53endif
54
51ifneq (,$(strip $(filter linux-pulse,$(MAKECMDGOALS))))55ifneq (,$(strip $(filter linux-pulse,$(MAKECMDGOALS))))
52include makefile.x/makefile.pulse56include makefile.x/makefile.pulse
53endif57endif
@@ -112,14 +116,6 @@ ifneq (,$(MAC_UB)) · 58 unmodified lines
112ARCHOPTS=-arch arm64 -arch x86_64116ARCHOPTS=-arch arm64 -arch x86_64
113endif117endif
114 118
115NOTES=AUTHORS DEVELOPER PROGRAMMER README TODO COPYING INSTALL QUICKSTART \
116 THANKS VERSIONS
117BIN_NOTES=README.txt
118DOC_NOTES=GOTO
119DIST_DIR=chuck-$(CK_VERSION)
120DIST_DIR_EXE=chuck-$(CK_VERSION)-exe
121CK_SVN=https://chuck-dev.stanford.edu/svn/chuck/
122
123# pull in dependency info for *existing* .o files119# pull in dependency info for *existing* .o files
124-include $(OBJS:.o=.d)120-include $(OBJS:.o=.d)
125 121
src/makefile+23−19
@@ -1,19 +1,20 @@
1COREDIR=core1COREDIR=core
2HOSTDIR=host2HOSTDIR=host
3RTAUDIODIR=RtAudio3RTAUDIODIR=RtAudio
4DESTDIR?=/usr/local/bin4CK_VERSION=1.5.0.3-dev
5CK_PLATFORM=
6 5
7 6
8########################## DEFAULT MAKE TARGET #################################7########################## DEFAULT MAKE TARGET #################################
9# default target: print usage message and quit8# default target: print usage message and quit
10current:9current:
11 @echo "[chuck build]: please use one of the following configurations:"10 @echo "[chuck build]: please use the following configurations:"
12 @echo " make linux-alsa, make linux-jack, make linux-pulse,"11 @echo " make linux-alsa, make linux-jack, make linux-pulse, linux-all,"
13 @echo " make mac, make mac-ub, make cygwin, make win32, or make web"12 @echo " make mac, make mac-ub, make web, make cygwin, make win32"
14 13
15 14
16############################## MAKE INSTALL ####################################15############################## MAKE INSTALL ####################################
16DESTDIR?=/usr/local/bin
17
17install:18install:
18 mkdir -p $(DESTDIR)19 mkdir -p $(DESTDIR)
19 cp $(wildcard chuck chuck.exe) $(DESTDIR)/20 cp $(wildcard chuck chuck.exe) $(DESTDIR)/
@@ -68,18 +69,17 @@ host_web/webchuck/js/webchuck.js: $(EMSCRIPTENSRCS) · 48 unmodified lines
68 69
69 70
70 71
71############################## MAKE INSTALL ####################################72################################ PLATFORMS #####################################
72## note: If you want to build ChucK on linux with multiple audio drivers,73## note: If you want to build ChucK on linux with multiple audio drivers,
73## call multiple build rules, e.g.:74## combine multiple build rules, e.g.:
74## > make linux-pulse linux-alsa linux-jack75## > make linux-pulse linux-alsa linux-jack
75.PHONY: mac mac-ub osx linux-pulse linux-jack linux-alsa cygwin osx-rl test76
76mac mac-ub osx linux-pulse linux-jack linux-alsa cygwin osx-rl: chuck77.PHONY: mac mac-ub osx linux-all linux linux-pulse linux-jack linux-alsa cygwin osx-rl test
78mac mac-ub osx linux-all linux linux-pulse linux-jack linux-alsa cygwin osx-rl: chuck
77 79
78win32:80win32:
79 make -f $(COREDIR)/makefile.x/makefile.win3281 make -f $(COREDIR)/makefile.x/makefile.win32
80 82
81CK_VERSION=1.5.0.0
82
83 83
84########################### COMPILATION TOOLS ##################################84########################### COMPILATION TOOLS ##################################
85LEX=flex85LEX=flex
@@ -121,10 +121,15 @@ endif · 35 unmodified lines
121 121
122 122
123######################### PLATFORM-SPECIFIC THINGS #############################123######################### PLATFORM-SPECIFIC THINGS #############################
124
124ifneq (,$(strip $(filter mac mac-ub osx bin-dist-mac,$(MAKECMDGOALS))))125ifneq (,$(strip $(filter mac mac-ub osx bin-dist-mac,$(MAKECMDGOALS))))
125include $(COREDIR)/makefile.x/makefile.mac126include $(COREDIR)/makefile.x/makefile.mac
126endif127endif
127 128
129ifneq (,$(strip $(filter linux linux-all,$(MAKECMDGOALS))))
130include $(COREDIR)/makefile.x/makefile.linux
131endif
132
128ifneq (,$(strip $(filter linux-pulse,$(MAKECMDGOALS))))133ifneq (,$(strip $(filter linux-pulse,$(MAKECMDGOALS))))
129include $(COREDIR)/makefile.x/makefile.pulse134include $(COREDIR)/makefile.x/makefile.pulse
130endif135endif
@@ -201,14 +206,12 @@ ARCH_ARGS=MAC_UB=true · 70 unmodified lines
201CFLAGS+=-D__MACOSX_UB__206CFLAGS+=-D__MACOSX_UB__
202endif207endif
203 208
209
204############################ DISTRIBUTION INFO #################################210############################ DISTRIBUTION INFO #################################
205NOTES=AUTHORS DEVELOPER PROGRAMMER README TODO COPYING INSTALL QUICKSTART \211# release notes
206 THANKS VERSIONS212NOTES=AUTHORS DEVELOPERS INSTALL LICENSE QUICKSTART README.md THANKS VERSIONS
207BIN_NOTES=README.txt213# where to put the newly constructed distribution
208DOC_NOTES=GOTO
209DIST_DIR=chuck-$(CK_VERSION)214DIST_DIR=chuck-$(CK_VERSION)
210DIST_DIR_EXE=chuck-$(CK_VERSION)-exe
211CK_SVN=https://chuck-dev.stanford.edu/svn/chuck/
212 215
213# pull in dependency info for *existing* .o files216# pull in dependency info for *existing* .o files
214-include $(OBJS:.o=.d)217-include $(OBJS:.o=.d)
@@ -259,10 +262,11 @@ src-dist: · 44 unmodified lines
259 mkdir $(DIST_DIR) $(DIST_DIR)/src $(DIST_DIR)/examples262 mkdir $(DIST_DIR) $(DIST_DIR)/src $(DIST_DIR)/examples
260# copy src263# copy src
261 git archive HEAD src | tar -x -C $(DIST_DIR)264 git archive HEAD src | tar -x -C $(DIST_DIR)
262 rm -r $(DIST_DIR)/src/test265# rm -r $(DIST_DIR)/src/test
263# copy examples266# copy examples
264 git archive HEAD examples | tar -x -C $(DIST_DIR)267 git archive HEAD examples | tar -x -C $(DIST_DIR)
265# copy notes268# copy notes
266 cp $(addprefix notes/,$(NOTES)) $(DIST_DIR)269 cp $(addprefix ./,$(NOTES)) $(DIST_DIR)
267# tar/gzip270# tar/gzip
268 tar czf $(DIST_DIR).tgz $(DIST_DIR)271 tar czf $(DIST_DIR).tgz $(DIST_DIR)
272

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t