OW2 Consortium
Search OW2 Mail Archive: 

Advanced Search - Powered by Google


Mail Archive Home | fractal-commits List | July 2008 Index

<--  Date Index  --> <--  Thread Index  -->

[fractal-commits] [8318] sandbox/debrouxl/libmpeg2: Upgrade dependency on Cecilia from 2. 0-beta-2-SNAPSHOT to 2.1-SNAPSHOT.


Title: [8318] sandbox/debrouxl/libmpeg2: Upgrade dependency on Cecilia from 2.0-beta-2-SNAPSHOT to 2.1-SNAPSHOT.
Revision
8318
Author
debrouxl
Date
2008-07-24 11:29:00 +0200 (Thu, 24 Jul 2008)

Log Message

Upgrade dependency on Cecilia from 2.0-beta-2-SNAPSHOT to 2.1-SNAPSHOT.
Switch to a target descriptor (feature added in 2.0-beta-2) for configuring the maven-ceciliaadl-plugin.

Modified Paths

Added Paths

Diff

Modified: sandbox/debrouxl/libmpeg2/getting_started.txt (8317 => 8318)


--- sandbox/debrouxl/libmpeg2/getting_started.txt	2008-07-24 06:53:00 UTC (rev 8317)
+++ sandbox/debrouxl/libmpeg2/getting_started.txt	2008-07-24 09:29:00 UTC (rev 8318)
@@ -1,6 +1,6 @@
 Getting started instructions for component-based version of libmpeg2 MPEG-2 decoder
 -----------------------------------------------------------------------------------
-Last updated 2008/01/28.
+Last updated 2008/07/24.
 
 
 Requirements
@@ -23,7 +23,7 @@
         * automake 1.10
         * autoconf 2.61-4;
         * m4 1.4.8-2;
-        * libtool 1.5.22-4.
+        * libtool 1.5.22, 1.5.24.
         * gcc 4.1.1-15.
 
 
@@ -47,14 +47,14 @@
 ------------------------------------
 After a successful configuration of the decoder:
     * In the sandbox/debrouxl/libmpeg2/trunk/src/main/cecilia folder, open "Makefile" with your favorite text editor.
-    * In the sandbox/debrouxl/libmpeg2/trunk folder, edit "pom.xml" to change the "compiler-command", "c-flags", "linker-command" and "ld-flags" with the respective values of "CC", "OPT_CFLAGS", "CC" and ("LD_FLAGS" before "LIBVO_LIBS"), found in Makefile.
-(This sucks, the two previous steps will be automated.)
-    * In the sandbox/debrouxl/libmpeg2/trunk folder, run `mvn install`. This will build the component-based decoder.
+    * In the sandbox/debrouxl/libmpeg2/trunk/src/main/cecilia/unix folder, edit "libmpeg2-warnings.td" to change the <compiler>, <linker>, <cFlags>, <ldFlags> according to values of "CC", "CC", "OPT_CFLAGS", "LD_FLAGS", as found in Makefile.
+(Note to self: this sucks, the two previous steps should be automated.)
+    * In the sandbox/debrouxl/libmpeg2/trunk folder, run `mvn clean compile`. This will build the component-based decoder.
 
 
 Running the libmpeg2 MPEG-2 decoder
 -----------------------------------
-After a successful build of the decoder, the generated executable is sandbox/debrouxl/libmpeg2/trunk/target/build/obj/mpeg2dec. `mpeg2dec -h` tells how to use it:
+After a successful build of the decoder, the generated executable is sandbox/debrouxl/libmpeg2/trunk/target/build/obj/mpeg2dec. `mpeg2dec -h` tells how to use it (NOTE: the available video outputs depend on the configuration options passed to `configure`):
 mpeg2dec-0.5.0-cvs - by Michel Lespinasse <walken@xxxxxxx> and Aaron Holtzman
 usage: ./target/build/obj/mpeg2dec [-h] [-o <mode>] [-s [<track>]] [-t <pid>] [-p] [-c] \
                 [-v] [-b <bufsize>] <file>
@@ -88,6 +88,9 @@
 
 Document history
 ----------------
+* 2008/07/24:
+    * Starting from Cecilia 2.0-beta-2, target descriptors are a good way of configuring the compiler, linker, flags for multiple platforms (instead of changing the pom.xml). Switch to target descriptors.
+
 * 2008/06/16:
     * Minor changes.
 

Modified: sandbox/debrouxl/libmpeg2/trunk/pom.xml (8317 => 8318)


--- sandbox/debrouxl/libmpeg2/trunk/pom.xml	2008-07-24 06:53:00 UTC (rev 8317)
+++ sandbox/debrouxl/libmpeg2/trunk/pom.xml	2008-07-24 09:29:00 UTC (rev 8318)
@@ -9,7 +9,7 @@
 	<groupId>org.objectweb.fractal.cecilia.examples.libmpeg2</groupId>
 	<artifactId>trunk</artifactId>
 	<packaging>cecilia-application</packaging>
-	<version>2.0-beta-2-SNAPSHOT</version>
+	<version>2.1-SNAPSHOT</version>
 
 	<!-- ================================================ -->
 	<!--       REPOSITORIES                               -->
@@ -75,9 +75,9 @@
 			${project.build.directory}/cecilia-dependencies
 		</cecilia.src>
 		<!-- XXX this must be changed manually on each release -->
-		<cecilia.version>2.0-beta-2-SNAPSHOT</cecilia.version>
+		<cecilia.version>2.1-SNAPSHOT</cecilia.version>
 		<!-- XXX this must be changed manually on each release -->
-		<ceciliaadl.plugin.version>2.0-beta-2-SNAPSHOT</ceciliaadl.plugin.version>
+		<ceciliaadl.plugin.version>2.1-SNAPSHOT</ceciliaadl.plugin.version>
 	</properties>
 	<!-- ============================================================ -->
 
@@ -114,7 +114,7 @@
 				<version>${ceciliaadl.plugin.version}</version>
 				<configuration>
 					<!--<adl>unix.boot.BootstrappedApplication(mpeg2dec.MPEG2Dec)</adl>-->
-					<target>unix</target>
+					<target>unix.warnings-libmpeg2</target>
 					<adl>mpeg2dec.MPEG2Dec:mpeg2dec</adl>
 					<arguments>
 						<parameter>
@@ -126,23 +126,10 @@
 							<value>${cecilia.src}:${basedir}/src/main/cecilia</value>
 						</parameter>
 						<parameter>
-							<name>compiler-command</name>
-							<value>gcc</value>
-						</parameter>
-						<parameter>
 							<name>c-flags</name>
 							<!-- COMPILING_WITH_CECILIA makes both this build process and make-based process work without syntax errors -->
-							<value>-g3 -c -Wall -W -Wno-unused-parameter -Wredundant-decls -Wshadow -Wpointer-arith -Wwrite-strings -O3 -fomit-frame-pointer -fno-common -DCOMPILING_WITH_CECILIA</value>
+							<value>-DCOMPILING_WITH_CECILIA</value>
 						</parameter>
-						<parameter>
-							<name>linker-command</name>
-							<value>gcc</value>
-						</parameter>
-						<parameter>
-							<name>ld-flags</name>
-							<!-- FIXME: depends on configuration made by bootstrap; configure -->
-							<value>-lSM -lICE -lXext -lX11 -lXv -lSDL</value>
-						</parameter>
 					</arguments>
 				</configuration>
 			</plugin>

Added: sandbox/debrouxl/libmpeg2/trunk/src/main/cecilia/unix/warnings-libmpeg2.td (0 => 8318)


--- sandbox/debrouxl/libmpeg2/trunk/src/main/cecilia/unix/warnings-libmpeg2.td	                        (rev 0)
+++ sandbox/debrouxl/libmpeg2/trunk/src/main/cecilia/unix/warnings-libmpeg2.td	2008-07-24 09:29:00 UTC (rev 8318)
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE target PUBLIC "-//objectweb.org//DTD Fractal ADL 2.0//EN" 
+  "classpath://org/objectweb/fractal/cecilia/targetDescriptor/ast/targetDescriptor.dtd">
+
+<!-- START SNIPPET: Content -->
+<target name="unix.warnings-libmpeg2">
+	<extends name="unix" />
+        <!-- Change according to the programs you're using -->
+        <!--	<compiler path="gcc" />
+	<linker path="gcc" />
+	<archiver path="ar" />--> 
+	<!-- Depends on the flags passed to `configure` -->
+	<cFlag id="debug" value="-g3" />
+	<!-- Depends on the flags passed to `configure` -->
+	<cFlag id="warning" value="-Wall -W -Wno-unused-parameter -Wredundant-decls -Wshadow -Wpointer-arith -Wwrite-strings" />
+	<!-- Depends on configuration made by `bootstrap; configure` -->
+	<cFlag id="optimization" value="-O3 -fomit-frame-pointer -fno-common" />
+	<!-- Depends on configuration made by `bootstrap; configure` -->
+        <ldFlag id="libmpeg2" value="-lSM -lICE -lXext -lX11 -lXv -lSDL" />
+</target>


<--  Date Index  --> <--  Thread Index  -->

Reply via email to:

Powered by MHonArc.

Copyright © 2006-2007, OW2 Consortium | contact | webmaster.