traverso-commit
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Traverso-commit] traverso autopackage/default.apspec CMakeLists....


From: Remon Sijrier
Subject: [Traverso-commit] traverso autopackage/default.apspec CMakeLists....
Date: Wed, 02 Jan 2008 22:05:19 +0000

CVSROOT:        /sources/traverso
Module name:    traverso
Changes by:     Remon Sijrier <r_sijrier>       08/01/02 22:05:19

Modified files:
        autopackage    : default.apspec 
        .              : CMakeLists.txt make-autopackage.sh 
        src/traverso   : CMakeLists.txt 

Log message:
        * updated to work with autopackage . Just run make-autopackage.sh and 
all should be well (if your qmake is that of an apbuild one)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/autopackage/default.apspec?cvsroot=traverso&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/traverso/CMakeLists.txt?cvsroot=traverso&r1=1.22&r2=1.23
http://cvs.savannah.gnu.org/viewcvs/traverso/make-autopackage.sh?cvsroot=traverso&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/CMakeLists.txt?cvsroot=traverso&r1=1.7&r2=1.8

Patches:
Index: autopackage/default.apspec
===================================================================
RCS file: /sources/traverso/traverso/autopackage/default.apspec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- autopackage/default.apspec  4 Jun 2007 22:25:32 -0000       1.1
+++ autopackage/default.apspec  2 Jan 2008 22:05:18 -0000       1.2
@@ -13,7 +13,7 @@
 Summary: Traverso Multitrack Audio Recorder and Editor
 URL: http://traverso-daw.org
 License: GNU General Public License, Version 2
-SoftwareVersion: 0.40.0
+SoftwareVersion: 0.42.0
 # SoftwareVersion: @VERSION@
 # Repository: http://www.mysite.org/downloads/myproject.xml
 
@@ -52,10 +52,11 @@
        out "Qt is compiled with something newer. Be very careful."
 fi
 
-$QTDIR/bin/qmake traverso.pro QMAKE_CXX=apg++ QMAKE_CC=apgcc
-make
+CC=apgcc CXX=apg++ cmake . -DAUTOPACKAGE_BUILD=YES
 
-if [ `objdump -x /usr/bin/traverso |grep NEEDED|grep Qt|wc -l` -ne 0 ]; then
+make -j2
+
+if [ `objdump -x bin/traverso |grep NEEDED|grep Qt|wc -l` -ne 0 ]; then
        red; outn; "FAIL: "; normal;
        out "This binary is linked dynamically against some Qt libs."
        out "Make sure you're compiling against a static Qt."
@@ -67,7 +68,7 @@
 mkdir -p $build_root/share/icons/hicolor
 mkdir -p $build_root/share/mime/packages
 
-cp traverso $build_root/bin
+cp bin/traverso $build_root/bin
 cp resources/traverso.desktop $build_root/share/applications
 cp resources/x-traverso.xml $build_root/share/mime/packages
 cp -R resources/freedesktop/icons/* "$build_root/share/icons/hicolor"
@@ -90,7 +91,7 @@
 require @freetype.org/freetype 6.3
 require @zlib.org/zlib 1.2
 # require @gtk.org/glib # TODO: figure out how glib's versioning works
-require @opengl.org/opengl 1.4
+# require @opengl.org/opengl 1.4
 require @mega-nerd.com/libsndfile 1.0
 require @xmlsoft.org/libxslt 1.1
 require @xmlsoft.org/libxml2 2.4

Index: CMakeLists.txt
===================================================================
RCS file: /sources/traverso/traverso/CMakeLists.txt,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- CMakeLists.txt      7 Dec 2007 15:40:16 -0000       1.22
+++ CMakeLists.txt      2 Jan 2008 22:05:19 -0000       1.23
@@ -32,6 +32,7 @@
 OPTION(WANT_TRAVERSO_DEBUG "Provides 4 levels of debug ouput on the command 
line, always on for DEBUG builds" OFF)
 OPTION(WANT_THREAD_CHECK       "Checks at runtime if functions are called from 
the correct thread, used by developers for debugging" OFF)
 OPTION(WANT_VECLIB_OPTIMIZATIONS "Build with veclib optimizations (Only for 
PPC based Mac OS X)" OFF)
+OPTION(AUTOPACKAGE_BUILD "Build traverso with autopackage tools" OFF)
 
 
 SET(MAIN_DIR_NAME "src")
@@ -48,8 +49,6 @@
   ENDIF (NOT CUSTOM_VERSIONTAG)
 ENDIF (WANT_VERSIONING AND NOT CACHED_VERSIONING)
 
-
-
 # Static build is perfectly fine now, targets are properly relinked when 
needed!
 SET(TRAVERSO_DEFINES -DSTATIC_BUILD)
 
@@ -367,12 +366,6 @@
                SET(HAVE_ALSA FALSE)
        ENDIF(WANT_ALSA)
 
-
-       find_program(RELAYTOOL_EXECUTABLE NAMES relaytool)
-       IF(RELAYTOOL_EXECUTABLE)
-               LIST(APPEND TRAVERSO_DEFINES -DRELAYTOOL_PRESENT)
-       ENDIF(RELAYTOOL_EXECUTABLE)
-
 # END LINUX section
 
 
@@ -434,7 +427,7 @@
                ENDIF(uname_invoke_result MATCHES i586)
                                
                IF(uname_invoke_result MATCHES i686)
-                       SET(uname_invoke_result  "${CMAKE_CXX_FLAGS_RELEASE} 
-march=i686")
+                       SET(CMAKE_CXX_FLAGS_RELEASE  
"${CMAKE_CXX_FLAGS_RELEASE} -march=i686")
                        IF(HOST_SUPPORTS_SSE)
                                SET(CMAKE_CXX_FLAGS_RELEASE  
"${CMAKE_CXX_FLAGS_RELEASE} -msse -mfpmath=sse")
                                LIST(APPEND TRAVERSO_DEFINES -DUSE_XMMINTRIN)
@@ -568,6 +561,7 @@
 QT_X11_Xext_LIBRARY
 LIBRARY_OUTPUT_PATH
 WANT_THREAD_CHECK
+AUTOPACKAGE_BUILD
 )
 
 

Index: make-autopackage.sh
===================================================================
RCS file: /sources/traverso/traverso/make-autopackage.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- make-autopackage.sh 4 Jun 2007 09:00:18 -0000       1.1
+++ make-autopackage.sh 2 Jan 2008 22:05:19 -0000       1.2
@@ -1,10 +1,11 @@
 #!/bin/bash
 unset CXX2 # disable C++ ABI workaround since we're statically linking all C++ 
libs
-export CXX1=g++-gcc-3.4.6
+export CXX1=g++
 
 #slv2=$PWD/autopackage/static-libs/libslv2.a
 # libGLU needs to be statically linked since it's a C++ lib, the others are 
uncommon
-export APBUILD_STATIC="rdf=$PWD/autopackage/static-libs/librdf.a 
raptor=$PWD/autopackage/static-libs/libraptor.a 
rasqal=$PWD/autopackage/static-libs/librasqal.a 
GLU=$PWD/autopackage/static-libs/libGLU.a samplerate sqlite3"
+export APBUILD_DEBUG=1
+export APBUILD_STATIC="rdf=$PWD/autopackage/static-libs/librdf.a 
raptor=$PWD/autopackage/static-libs/libraptor.a 
rasqal=$PWD/autopackage/static-libs/librasqal.a 
wavpack=$PWD/autopackage/static-libs/libwavpack.a samplerate sqlite3 libXrender"
 
-export QTDIR=/usr/local/Trolltech/Qt-4.3.0-apbuild/
+export QTDIR=/usr/local/Trolltech/Qt-4.3.3
 makepackage

Index: src/traverso/CMakeLists.txt
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/CMakeLists.txt,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- src/traverso/CMakeLists.txt 11 Dec 2007 20:45:16 -0000      1.7
+++ src/traverso/CMakeLists.txt 2 Jan 2008 22:05:19 -0000       1.8
@@ -113,99 +113,115 @@
 QT4_ADD_RESOURCES(TRAVERSO_RESOURCES
 traverso.qrc
 )
-
 QT4_WRAP_CPP(TRAVERSO_GUI_MOC_SOURCES ${TRAVERSO_GUI_MOC_CLASSES})
-
 QT4_WRAP_UI(TRAVERSO_GUI_UI_SOURCES ${TRAVERSO_UI_FILES})
 
-ADD_EXECUTABLE(traverso
-    ${TRAVERSO_GUI_SOURCES}
-    ${TRAVERSO_GUI_UI_SOURCES}
-    ${TRAVERSO_GUI_MOC_SOURCES}
-    ${TRAVERSO_RESOURCES}
-)
-
+IF(AUTOPACKAGE_BUILD)
+       find_program(RELAYTOOL_EXECUTABLE NAMES relaytool)
 
-SET(JACK_LIB jack)
-SET(FLAC_LIB FLAC)
-SET(MAD_LIB mad)
-SET(LAME_LIB mp3lame)
-SET(OGG_LIB ogg)
-SET(VORBIS_LIB vorbis)
-SET(VORBIS_FILE_LIB vorbisfile)
-SET(VORBIS_ENC_LIB vorbisenc)
-SET(WAVPACK_LIB wavpack)
-
-IF(LINUX)
-find_program(RELAYTOOL_EXECUTABLE NAMES relaytool)
-IF(RELAYTOOL_EXECUTABLE)
+       IF(RELAYTOOL_EXECUTABLE)
        
        execute_process(
                COMMAND relaytool --multilink libjack.so.0 libjack-0.100.0.so.0 
--relay jack -ljack
                OUTPUT_VARIABLE relaytool_invoke_result
                RESULT_VARIABLE relaytool_failed
        )
-       SET(JACK_LIB relaytool_invoke_result)
+               string(REGEX REPLACE "\n" "" relaytool_invoke_result 
"${relaytool_invoke_result}")
+               string(REGEX REPLACE " +$" "" relaytool_invoke_result 
"${relaytool_invoke_result}")
+               SET(JACK_STUB ../../${relaytool_invoke_result})
 
        execute_process(
                COMMAND relaytool --relay FLAC -lFLAC
                OUTPUT_VARIABLE relaytool_invoke_result
                RESULT_VARIABLE relaytool_failed
        )
-       SET(FLAC_LIB relaytool_invoke_result)
+               string(REGEX REPLACE "\n" "" relaytool_invoke_result 
"${relaytool_invoke_result}")
+               string(REGEX REPLACE " +$" "" relaytool_invoke_result 
"${relaytool_invoke_result}")
+               SET(FLAC_STUB ../../${relaytool_invoke_result})
 
        execute_process(
                COMMAND relaytool --relay mad -lmad
                OUTPUT_VARIABLE relaytool_invoke_result
                RESULT_VARIABLE relaytool_failed
        )
-       SET(MAD_LIB relaytool_invoke_result)
+               string(REGEX REPLACE "\n" "" relaytool_invoke_result 
"${relaytool_invoke_result}")
+               string(REGEX REPLACE " +$" "" relaytool_invoke_result 
"${relaytool_invoke_result}")
+               SET(MAD_STUB ../../${relaytool_invoke_result})
 
        execute_process(
                COMMAND relaytool --relay mp3lame -lmp3lame
                OUTPUT_VARIABLE relaytool_invoke_result
                RESULT_VARIABLE relaytool_failed
        )
-       SET(LAME_LIB relaytool_invoke_result)
+               string(REGEX REPLACE "\n" "" relaytool_invoke_result 
"${relaytool_invoke_result}")
+               string(REGEX REPLACE " +$" "" relaytool_invoke_result 
"${relaytool_invoke_result}")
+               SET(LAME_STUB ../../${relaytool_invoke_result})
 
        execute_process(
                COMMAND relaytool --relay ogg -logg
                OUTPUT_VARIABLE relaytool_invoke_result
                RESULT_VARIABLE relaytool_failed
        )
-       SET(OGG_LIB relaytool_invoke_result)
+               string(REGEX REPLACE "\n" "" relaytool_invoke_result 
"${relaytool_invoke_result}")
+               string(REGEX REPLACE " +$" "" relaytool_invoke_result 
"${relaytool_invoke_result}")
+               SET(OGG_STUB ../../${relaytool_invoke_result})
 
        execute_process(
                COMMAND relaytool --relay vorbis -lvorbis
                OUTPUT_VARIABLE relaytool_invoke_result
                RESULT_VARIABLE relaytool_failed
        )
-       SET(VORBIS_LIB relaytool_invoke_result)
+               string(REGEX REPLACE "\n" "" relaytool_invoke_result 
"${relaytool_invoke_result}")
+               string(REGEX REPLACE " +$" "" relaytool_invoke_result 
"${relaytool_invoke_result}")
+               SET(VORBIS_STUB ../../${relaytool_invoke_result})
 
        execute_process(
                COMMAND relaytool --relay vorbisfile -lvorbisfile
                OUTPUT_VARIABLE relaytool_invoke_result
                RESULT_VARIABLE relaytool_failed
        )
-       SET(VORBIS_FILE_LIB relaytool_invoke_result)
+               string(REGEX REPLACE "\n" "" relaytool_invoke_result 
"${relaytool_invoke_result}")
+               string(REGEX REPLACE " +$" "" relaytool_invoke_result 
"${relaytool_invoke_result}")
+               SET(VORBISFILE_STUB ../../${relaytool_invoke_result})
 
        execute_process(
                COMMAND relaytool --relay vorbisenc -lvorbisenc
                OUTPUT_VARIABLE relaytool_invoke_result
                RESULT_VARIABLE relaytool_failed
        )
-       SET(VORBIS_ENC_LIB relaytool_invoke_result)
-
-       execute_process(
-               COMMAND relaytool --relay wavpack -lwavpack
-               OUTPUT_VARIABLE relaytool_invoke_result
-               RESULT_VARIABLE relaytool_failed
-       )
-       SET(WAVPACK_LIB relaytool_invoke_result)
-
-ENDIF(RELAYTOOL_EXECUTABLE)
-ENDIF(LINUX)
+               string(REGEX REPLACE "\n" "" relaytool_invoke_result 
"${relaytool_invoke_result}")
+               string(REGEX REPLACE " +$" "" relaytool_invoke_result 
"${relaytool_invoke_result}")
+               SET(VORBIS_ENC_STUB ../../${relaytool_invoke_result})
+               
+               MESSAGE(${VORBIS_ENC_STUB})
+       
+       ENDIF(RELAYTOOL_EXECUTABLE)
+
+ELSE(AUTOPACKAGE_BUILD)
+       SET(JACK_LIB jack)
+       SET(FLAC_LIB FLAC)
+       SET(MAD_LIB mad)
+       SET(LAME_LIB mp3lame)
+       SET(OGG_LIB ogg)
+       SET(VORBIS_LIB vorbis)
+       SET(VORBIS_FILE_LIB vorbisfile)
+       SET(VORBIS_ENC_LIB vorbisenc)
+ENDIF(AUTOPACKAGE_BUILD)
 
+ADD_EXECUTABLE(traverso
+    ${TRAVERSO_GUI_SOURCES}
+    ${TRAVERSO_GUI_UI_SOURCES}
+    ${TRAVERSO_GUI_MOC_SOURCES}
+    ${TRAVERSO_RESOURCES}
+    ${JACK_STUB}
+    ${FLAC_STUB}
+    ${MAD_STUB}
+    ${LAME_STUB}
+    ${OGG_STUB}
+    ${VORBIS_STUB}
+    ${VORBISFILE_STUB}
+    ${VORBIS_ENC_STUB}
+)
 
 TARGET_LINK_LIBRARIES(traverso
        ${QT_LIBRARIES}
@@ -219,13 +235,14 @@
        traversocommands
        samplerate
        sndfile
-       ${WAVPACK_LIB}
+       wavpack
        ${OGG_LIB}
        ${VORBIS_LIB}
        ${VORBIS_FILE_LIB}
        ${VORBIS_ENC_LIB}
        ${FLAC_LIB}
        fftw3
+       rt
 )
 
 IF(HAVE_PORTAUDIO)
@@ -241,10 +258,10 @@
                )
        ELSE(USE_SYSTEM_SLV2_LIBRARY)
                TARGET_LINK_LIBRARIES(traverso
+                       traversoslv2
                        rdf
                        rasqal
                        raptor
-                       traversoslv2
                )
        ENDIF(USE_SYSTEM_SLV2_LIBRARY)
 ENDIF(HAVE_SLV2)
@@ -278,7 +295,7 @@
 TARGET_LINK_LIBRARIES(traverso
        ${JACK_LIB}
 )
-ENDIF(HAVE_ALSA)
+ENDIF(HAVE_JACK)
 
 IF(USE_PCH)
     ADD_DEPENDENCIES(traverso precompiled_headers)




reply via email to

[Prev in Thread] Current Thread [Next in Thread]