Browse files

0.18 version increase, added RacketCollects to build script

  • Loading branch information...
1 parent 1cd483f commit 189bb382b34ba0c88652a91cb31583acb72e0b4e @nebogeo nebogeo committed May 24, 2011
View
10 SConstruct
@@ -9,7 +9,7 @@
import os, os.path, sys, commands, subprocess
MajorVersion = "0"
-MinorVersion = "17"
+MinorVersion = "18"
FluxusVersion = MajorVersion+MinorVersion
# remember to change fluxa too...
Target = "fluxus"
@@ -29,17 +29,22 @@ if sys.platform == 'darwin':
RacketPrefix = ARGUMENTS.get('RacketPrefix', RacketBin[:-5])
RacketInclude = ARGUMENTS.get('RacketInclude', RacketPrefix + "/include")
RacketLib = ARGUMENTS.get('RacketLib', RacketPrefix + "/lib")
+ RacketCollects = ARGUMENTS.get('RacketCollects', RacketPrefix + "/collects/")
elif sys.platform == 'win32':
Prefix = ARGUMENTS.get('Prefix','c:/Program Files/Fluxus')
RacketPrefix = ARGUMENTS.get('RacketPrefix','c:/Program Files/Racket')
RacketInclude = ARGUMENTS.get('RacketInclude', RacketPrefix + "/include")
RacketLib = ARGUMENTS.get('RacketLib', RacketPrefix + "/lib")
+ RacketCollects = ARGUMENTS.get('RacketCollects', RacketPrefix + "/collects/")
else:
Prefix = ARGUMENTS.get('Prefix','/usr/local')
RacketPrefix = ARGUMENTS.get('RacketPrefix','/usr/local')
RacketInclude = ARGUMENTS.get('RacketInclude', RacketPrefix + "/include/racket")
RacketLib = ARGUMENTS.get('RacketLib', RacketPrefix + "/lib/racket")
+# dave changed for racket package which puts collects in /usr/share
+ RacketCollects = ARGUMENTS.get('RacketCollects', RacketPrefix + "/collects/")
+
BinInstall = DESTDIR + Prefix + "/bin"
DataLocation = Prefix + "/share/fluxus-"+FluxusVersion
@@ -51,7 +56,8 @@ DocsInstall = DESTDIR + Prefix + "/share/doc/fluxus-" + FluxusVersion
if sys.platform == 'darwin' or sys.platform == 'win32':
RacketCollectsLocation = ARGUMENTS.get('RacketCollects', RacketPrefix + "/collects/")
else:
- RacketCollectsLocation = ARGUMENTS.get('RacketCollects', RacketLib + "/collects/")
+ RacketCollectsLocation = ARGUMENTS.get('RacketCollects', RacketCollects)
+
if sys.platform == 'darwin' and GetOption('app'):
RacketCollectsLocation = 'collects/' # not used relative racket collects path and
View
2 debian/rules
@@ -47,7 +47,7 @@ install: build
dh_installdirs
# Add here commands to install the package into debian/fluxus.
- scons Prefix=/usr PLTPrefix=/usr DESTDIR=debian/fluxus install
+ scons Prefix=/usr RacketPrefix=/usr DESTDIR=debian/fluxus install
install -d debian/fluxus/usr/share/pixmaps
install -m 644 modules/material/textures/fluxus-icon.png debian/fluxus/usr/share/pixmaps
install -d debian/fluxus/usr/share/applications
View
2 examples/cheap-outline.scm
@@ -1,4 +1,4 @@
-(require fluxus-017/tricks)
+(require fluxus-018/tricks)
(clear)
(define p (with-state
(hint-normal)
View
2 examples/collide-seq.scm
@@ -2,7 +2,7 @@
; same as mouse-interactive, but with sound!
; make sure you're also running jackd and fluxa
-(require fluxus-017/fluxa)
+(require fluxus-018/fluxa)
(clear)
View
2 examples/extrude.scm
@@ -1,6 +1,6 @@
; an example of the fluxus extrusion tool
-(require fluxus-017/shapes)
+(require fluxus-018/shapes)
(clear)
(clear-colour 0.5)
View
2 examples/frisbee/collision.scm
@@ -1,4 +1,4 @@
-(require fluxus-017/frisbee)
+(require fluxus-018/frisbee)
(define player-pos
(vec3 (key-control-b #\d #\a 0.01)
View
2 examples/frisbee/delete.scm
@@ -1,4 +1,4 @@
-(require fluxus-017/frisbee)
+(require fluxus-018/frisbee)
(define player-pos
(vec3 (key-control-b #\d #\a 0.01)
View
2 examples/frisbee/follow.scm
@@ -1,5 +1,5 @@
; frisbee version of the ball-on-string example
-(require fluxus-017/frisbee)
+(require fluxus-018/frisbee)
(define player-pos
(vec3 (key-control-b #\d #\a 0.01)
View
2 examples/frisbee/followers.scm
@@ -1,4 +1,4 @@
-(require fluxus-017/frisbee)
+(require fluxus-018/frisbee)
(define player-pos
(vec3 (key-control-b #\d #\a 0.01)
View
2 examples/frisbee/fps.scm
@@ -1,4 +1,4 @@
-(require fluxus-017/frisbee)
+(require fluxus-018/frisbee)
(set-camera (mmul (mtranslate (vec3 0 0 -20)) (mrotate (vec3 45 0 0))))
View
2 examples/frisbee/inertia.scm
@@ -1,4 +1,4 @@
-(require fluxus-017/frisbee)
+(require fluxus-018/frisbee)
(define player-pos
(vec3 (key-control-b #\d #\a 0.01)
View
2 examples/frisbee/invaders.scm
@@ -1,4 +1,4 @@
-(require fluxus-017/frisbee)
+(require fluxus-018/frisbee)
(define (between t a b)
(and (>= t a) (<= t b)))
View
2 examples/frisbee/metro.scm
@@ -1,4 +1,4 @@
-(require fluxus-017/frisbee)
+(require fluxus-018/frisbee)
(scene
(list
View
2 examples/frisbee/mushroom.scm
@@ -1,5 +1,5 @@
-(require fluxus-017/frisbee)
+(require fluxus-018/frisbee)
(clear)
(define (new-mushroom pos lst)
View
2 examples/frisbee/particles.scm
@@ -1,4 +1,4 @@
-(require fluxus-017/frisbee)
+(require fluxus-018/frisbee)
(scene
(list
View
2 examples/frisbee/rocket.scm
@@ -1,5 +1,5 @@
; a stupid shoot-em-up example for frisbee
-(require fluxus-017/frisbee)
+(require fluxus-018/frisbee)
(clear-colour (vector 0 0.4 1))
View
2 examples/frisbee/simple.scm
@@ -1,3 +1,3 @@
-(require fluxus-017/frisbee)
+(require fluxus-018/frisbee)
(scene (list (object)))
View
2 examples/frisbee/texture.scm
@@ -1,4 +1,4 @@
-(require fluxus-017/frisbee)
+(require fluxus-018/frisbee)
(scene
(list
View
2 examples/frisbee/torus-collide.scm
@@ -1,4 +1,4 @@
-(require fluxus-017/frisbee)
+(require fluxus-018/frisbee)
(define player-pos
View
2 examples/midi-test.scm
@@ -1,7 +1,7 @@
; simple midi test
; a cube is scaled by the value of controllers 1, 2, 3 on channel 0
-(require fluxus-017/fluxus-midi)
+(require fluxus-018/fluxus-midi)
(display (midi-info))(newline)
View
2 examples/missile-command.scm
@@ -1,7 +1,7 @@
; missile command - requires glsl support
; click mouse to lauch missiles
-(require fluxus-017/fluxa)
+(require fluxus-018/fluxa)
; use this to create livecoded abstract machinima,
; by hacking it in live performances...
View
2 examples/occlusion-bake.scm
@@ -8,7 +8,7 @@
; update if the model deforms or moves.
; need to include the optional extras
-(require fluxus-017/tricks)
+(require fluxus-018/tricks)
(clear)
View
2 examples/planetarium.scm
@@ -1,7 +1,7 @@
; The test script I used for projection at the Plymouth
; University Immersive Vision Theatre
-(require fluxus-017/planetarium)
+(require fluxus-018/planetarium)
(clear)
View
2 examples/sound.scm
@@ -2,7 +2,7 @@
; make sure fluxa is running and connected
; to jack [run 'fluxa' on the command line].
-(require fluxus-017/fluxa)
+(require fluxus-018/fluxa)
(seq
(lambda (time clock)
View
2 modules/scheme/boot.scm
@@ -33,7 +33,7 @@
; now require everything
(require scheme/pretty)
-(require fluxus-017/fluxus)
+(require fluxus-018/fluxus)
; load the helpmap
(init-help (string-append fluxus-collects-location "/" fluxus-name "/helpmap.scm"))

0 comments on commit 189bb38

Please sign in to comment.