[Demudi-commits] r1583 - csound/trunk/debian

fsateler-guest at alioth.debian.org fsateler-guest at alioth.debian.org
Fri Sep 7 17:53:48 UTC 2007


Author: fsateler-guest
Date: 2007-09-07 17:53:48 +0000 (Fri, 07 Sep 2007)
New Revision: 1583

Modified:
   csound/trunk/debian/custom.py
   csound/trunk/debian/rules
Log:
Clean up custom.py and move the build options there


Modified: csound/trunk/debian/custom.py
===================================================================
--- csound/trunk/debian/custom.py	2007-09-07 11:18:04 UTC (rev 1582)
+++ csound/trunk/debian/custom.py	2007-09-07 17:53:48 UTC (rev 1583)
@@ -15,119 +15,30 @@
 customSHLINKFLAGS = []
 customSWIGFLAGS = []
 
-if sys.platform[:5] == 'linux':
-    platform = 'linux'
-    customCPPPATH.append('/usr/include/lua5.1')
-    customCPPPATH.append('/usr/include/tcl8.4')
-elif sys.platform == 'darwin':
-    platform = 'darwin'
-    customCPPPATH.append('/usr/include/malloc')
-    customCPPPATH.append('/opt/local/include/boost-1_32/')
-    customCPPPATH.append('/usr/include/python2.3')
-    customCXXFLAGS.append('-fabi-version=0')
-elif sys.platform[:3] == 'win':
-    # For the basic build you need MinGW, MSys, and libsndfile.
-    # Add them here:
-    customCPPPATH.append('D:/utah/msys/1.0/mingw/include')
-    customLIBPATH.append('D:/utah/msys/1.0/mingw/lib')
-    # If libsndfile is not in a standard location add it here:
-    customCPPPATH.append(r'D:\utah\opt\libsndfile-1.0.18pre10\src')
-    customLIBPATH.append(r'D:\utah\opt\libsndfile-1.0.18pre10\src\.libs')
-    ################################################################
-    # If you want real-time audio you need PortAudio.
-    # If it is not in a standard location add it here
-    # (of course you must build it first):
-    customCPPPATH.append('D:/utah/opt/portaudio_varga/include')
-    customLIBPATH.append('D:/utah/opt/lazzarini')
-    ################################################################
-    # If you want PortMidi for real-time midi,
-    # if it is not in a standard location add it here
-    # (of course you must build it first):
-    customCPPPATH.append('D:/utah/opt/portmidi/pm_common')
-    customCPPPATH.append('D:/utah/opt/portmidi/pm_win')
-    customCPPPATH.append('D:/utah/opt/portmidi/porttime')
-    customLIBPATH.append('D:/utah/opt/portmidi/pm_win')
-    customLIBPATH.append('D:/utah/opt/portmidi/porttime')
-    customLIBPATH.append('D:/utah/opt/portmidi')
-    ################################################################
-    # If you want FLTK widgets or if you want to build CsoundVST,
-    # you need FLTK. If it is not in a standard location,
-    # add it here (of course you must build it first):
-    customCPPPATH.append('D:/utah/opt/fltk-1.1.7')
-    customLIBPATH.append('D:/utah/opt/csound5/bin')
-    #customLIBPATH.append('D:/utah/opt/fltk-1.1.7/lib')
-    ################################################################
-    # If you want to build CsoundVST you need Python and
-    # a MinGW import library for Python. Add them here:
-    customLIBPATH.append('D:/utah/msys/1.0/local/lib')
-    customCPPPATH.append('D:/utah/opt/Python25/include')
-    customLIBPATH.append('D:/utah/opt/Python25/Libs')
-    ################################################################
-    # If you want to build vst4cs you need the include
-    # path to the VST SDK header files. Add them there:
-    customCPPPATH.append('d:/utah/home/mkg/projects/csoundd/frontends/CsoundVST')    
-    ################################################################
-    # If you want to build scoregen you need the include
-    # path you need the VST MIDI plugin SDK header files. Copy
-    # the whole VST MIDI plugin SDK into the CsoundVST directory:
-    customCPPPATH.append('d:/utah/home/mkg/projects/csoundd/frontends/CsoundVST/VSTModuleArchitectureSDK/pluginterfaces/base')    
-    ################################################################
-    # If you want to build Lua interfaces you need Lua.
-    # Add it here:
-    customCPPPATH.append('D:/utah/opt/lua-5.1.1/src')
-    customLIBPATH.append('D:/utah/opt/lua-5.1.1/src')
-    ################################################################
-    # If you want to build Tcl/Tk interfaces
-    # and Tclcsound you need Tcl/Tk.
-    # Add it here:
-    customCPPPATH.append('D:/utah/opt/Tcl/include')
-    customLIBPATH.append('D:/utah/opt/Tcl/bin')
-    ################################################################
-    # If you want to build CsoundVST you need boost.
-    # If it is not in a standard lcoation add it here
-    # (you do NOT need to build it first):
-    customCPPPATH.append('D:/utah/opt/boost/')
-    ################################################################
-    # If you want to build the FluidSynth opcodes
-    # you need FluidSynth. If it is not a standard location,
-    # add it here (you do NOT need to build it first):
-    #customLIBPATH.append('D:/utah/opt/fluidsynth-1.0.3-win32')
-    #customCPPPATH.append('D:/utah/opt/fluidsynth-1.0.3-win32/include')
-    customLIBPATH.append('D:/utah/home/mkg/projects/fluid/fluidsynth/src')
-    customCPPPATH.append('D:/utah/home/mkg/projects/fluid/fluidsynth/include')
-    ################################################################
-    # If you want to build the Java wrapper for CsoundVST
-    # you need Java. If it is not in a standard location,
-    # add it here (you do NOT need to build it first):
-    customCPPPATH.append('D:/utah/opt/jdk1.5.0/include')
-    customCPPPATH.append('D:/utah/opt/jdk1.5.0/include/win32')
-    ################################################################
-    # If you want to build the PD external csoundapi~
-    # you need PD. If it is not in a standard location,
-    # add it here (you do NOT need to build it first):
-    customCPPPATH.append('D:/utah/opt/pd-0.38-4-devel-2/src')
-    customLIBPATH.append('D:/utah/opt/pd-0.38-4-devel-2/bin')
-    ################################################################
-    # If you want to build the Loris opcodes,
-    # then copy Loris to csound5/Opcodes/Loris. Loris also
-    # requires FFTW, if it is not in a standard location,
-    # add it here (you do need to build it first):
-    customCPPPATH.append('D:/utah/opt/fftw-3.0.1/api')
-    customLIBPATH.append('D:/utah/opt/fftw-3.0.1/.libs')
-    ################################################################
-    # If you want to build the OSC opcodes,
-    # if it is not in a standard location,
-    # add it here (you do need to build it first):
-    customCPPPATH.append(r'D:\utah\home\mkg\projects\liblo\lo')
-    customCPPPATH.append(r'D:\utah\home\mkg\projects\liblo')
-    customLIBPATH.append('D:/utah/home/mkg/projects/liblo/src/.libs')
-    # For OSC on Windows you will also need a Windows pthread library,
-    # if it is not in a standard location,
-    # add it here (you do need to build it first):
-    customCPPPATH.append('D:/utah/opt/pthreads/Pre-built.2/include')
-    customLIBPATH.append('D:/utah/opt/pthreads/Pre-build.2/lib')
-    ################################################################
-    # print "Adding custom path"
-else:
-    platform = 'unsupported platform'
+platform = 'linux'
+customCPPPATH.append('/usr/include/lua5.1')
+customCPPPATH.append('/usr/include/tcl8.4')
 
+useDouble=1
+usePortAudio=1
+usePortMIDI=1
+useALSA=1
+useJack=1
+useFLTK=1
+buildCsound5GUI=1
+buildWinsound=1
+generatePdf=0
+useOSC=1
+buildPythonOpcodes=1
+dynamicCsoundLibrary=1
+buildPDClass=1
+buildDSSI=1
+buildUtilities=1
+buildTclcsound=1
+buildVirtual=1
+buildInterfaces=1
+buildJavaWrapper=1
+buildCSEditor=1
+buildNewParser=0
+prefix=/usr
+

Modified: csound/trunk/debian/rules
===================================================================
--- csound/trunk/debian/rules	2007-09-07 11:18:04 UTC (rev 1582)
+++ csound/trunk/debian/rules	2007-09-07 17:53:48 UTC (rev 1583)
@@ -9,13 +9,6 @@
 # This has to be exported to make some magic below work.
 export DH_OPTIONS
 
-BUILDFLAGS=useDouble=1 usePortAudio=1 usePortMIDI=1 useALSA=1 \
-	   useJack=1 useFLTK=1 buildCsound5GUI=1 buildWinsound=1 \
-	   generatePdf=0 useOSC=1 buildPythonOpcodes=1 \
-	   dynamicCsoundLibrary=1 buildPDClass=1 \
-	   buildDSSI=1 buildUtilities=1 buildTclcsound=1 \
-	   buildVirtual=1 buildInterfaces=1 buildJavaWrapper=1 \
-	   buildCSEditor=1 buildNewParser=0 prefix=/usr
 
 CSVERSION=5.06.0
 
@@ -35,7 +28,7 @@
 build-arch: build-arch-stamp
 build-arch-stamp: patch-stamp
 	cp debian/custom.py custom.py
-	scons $(BUILDFLAGS) CFLAGS="$(CFLAGS)"
+	scons CFLAGS="$(CFLAGS)"
 	touch $@
 
 build-indep: build-indep-stamp
@@ -48,7 +41,7 @@
 	rm -f build-arch-stamp build-indep-stamp
 # Scons needs the build flags or else it will not clean up most stuff
 ifneq "$(wildcard ./custom.py)" "" # We actually built something
-	scons $(BUILDFLAGS) -c
+	scons -c
 	rm custom.py
 # and there still is stuff that doesn't get deleted.
 	rm -f interfaces/*.java
@@ -74,7 +67,7 @@
 	dh_clean -k -s 
 	dh_installdirs -s
 	
-	scons $(BUILDFLAGS) install=1 instdir=$(CURDIR)/debian/tmp
+	scons install=1 instdir=$(CURDIR)/debian/tmp
 # Rename extract to csound-extract to avoid conflict with extract
 	mv $(CURDIR)/debian/tmp/usr/bin/extract \
 		$(CURDIR)/debian/tmp/usr/bin/csound_extract




More information about the Demudi-commits mailing list