Permalink
Browse files

Synching with trunk...

git-svn-id: http://svn.codehaus.org/jruby/branches/enebo_block@2846 961051c9-f516-0410-bf72-c9f7e237a7b7
  • Loading branch information...
1 parent 7648869 commit 76eb0374137fa4894176461dabb97cca6f9f144f @enebo enebo committed Jan 26, 2007
@@ -1,150 +1,182 @@
-<?xml version="1.0"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <groupId>org.jruby</groupId>
- <artifactId>shared</artifactId>
- <version>0.9.3-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.jruby</groupId>
- <artifactId>jruby-complete</artifactId>
- <packaging>jar</packaging>
- <version>0.9.3-SNAPSHOT</version>
- <name>JRuby Complete</name>
-
- <dependencies>
- <dependency>
- <groupId>bouncycastle</groupId>
- <artifactId>bcprov-jdk15</artifactId>
- <version>134</version>
- <scope>system</scope>
- <systemPath>${project.basedir}/../../lib/bcprov-jdk15-134.jar</systemPath>
- </dependency>
- <dependency>
- <groupId>bouncycastle</groupId>
- <artifactId>bcmail-jdk15</artifactId>
- <version>134</version>
- <scope>system</scope>
- <systemPath>${project.basedir}/../../lib/bcmail-jdk15-134.jar</systemPath>
- </dependency>
- <dependency>
- <groupId>jline</groupId>
- <artifactId>jline</artifactId>
- <version>0.9.91-SNAPSHOT</version>
- <scope>system</scope>
- <systemPath>${project.basedir}/../../lib/jline-0.9.91-SNAPSHOT.jar</systemPath>
- </dependency>
- </dependencies>
-
- <build>
- <sourceDirectory>${project.basedir}/../../src</sourceDirectory>
- <resources>
- <resource>
- <directory>${project.basedir}/../../src</directory>
- <includes>
- <include>**/*.rb</include>
- <include>**/*.properties</include>
- </includes>
- </resource>
- </resources>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <id>unjar-deps</id>
- <phase>process-resources</phase>
- <configuration>
- <tasks>
- <unjar src="${project.basedir}/../../lib/plaincharset.jar" dest="${project.build.outputDirectory}"/>
- <unjar src="${project.basedir}/../../lib/jvyaml.jar" dest="${project.build.outputDirectory}"/>
- <delete file="${project.build.outputDirectory}/META-INF/MANIFEST.MF"/>
- <mkdir dir="${project.build.outputDirectory}/META-INF/jruby.home"/>
- <copy todir="${project.build.outputDirectory}/META-INF/jruby.home">
- <fileset dir="${project.basedir}/../..">
- <include name="bin/*"/>
- <include name="lib/ruby/gems/**/*"/>
- <include name="lib/ruby/site_ruby/**/*"/>
- </fileset>
- </copy>
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- <execution>
- <id>serialize</id>
- <phase>process-classes</phase>
- <configuration>
- <tasks>
- <taskdef name="jruby-serialize" classname="org.jruby.util.ant.JRubySerialize">
- <classpath path="${project.build.outputDirectory}"/>
- </taskdef>
- <jruby-serialize destdir="${project.build.outputDirectory}">
- <fileset dir="${project.build.sourceDirectory}">
- <include name="builtin/**/*.rb"/>
- </fileset>
- </jruby-serialize>
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- <execution>
- <id>jarjar</id>
- <phase>package</phase>
- <configuration>
- <tasks>
- <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask"
- classpath="${project.basedir}/../../lib/jarjar-0.7.jar"/>
- <delete file="${project.build.directory}/${project.build.finalName}.jar"/>
- <jarjar destfile="${project.build.directory}/${project.build.finalName}.jar">
- <fileset dir="${project.build.outputDirectory}">
- <include name="META-INF/jruby.home/**/*"/>
- <include name="META-INF/**/*"/>
- <include name="**/*.class"/>
- <include name="**/*.properties"/>
- <include name="**/*.rb"/>
- <include name="**/*.rb.ast.ser"/>
- <exclude name="builtin/**/*.rb"/>
- <exclude name="org/jruby/util/ant/**/*.class"/>
- </fileset>
- <fileset dir="${project.basedir}/../../lib/ruby/1.8">
- <include name="**/*.rb"/>
- </fileset>
- <zipfileset src="${project.basedir}/../../lib/asm-2.2.2.jar"/>
- <zipfileset src="${project.basedir}/../../lib/jline-0.9.91-SNAPSHOT.jar"/>
- <manifest>
- <attribute name="Built-By" value="${user.name}"/>
- <attribute name="Main-Class" value="${jruby.main.class}"/>
- </manifest>
- </jarjar>
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
-
+<?xml version="1.0"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>org.jruby</groupId>
+ <artifactId>shared</artifactId>
+ <version>0.9.3-SNAPSHOT</version>
+ <relativePath>../../pom.xml</relativePath>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.jruby</groupId>
+ <artifactId>jruby-complete</artifactId>
+ <packaging>jar</packaging>
+ <version>0.9.3-SNAPSHOT</version>
+ <name>JRuby Complete</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>bouncycastle</groupId>
+ <artifactId>bcprov-jdk15</artifactId>
+ <version>134</version>
+ <scope>system</scope>
+ <systemPath>${project.basedir}/../../lib/bcprov-jdk15-134.jar</systemPath>
+ </dependency>
+ <dependency>
+ <groupId>bouncycastle</groupId>
+ <artifactId>bcmail-jdk15</artifactId>
+ <version>134</version>
+ <scope>system</scope>
+ <systemPath>${project.basedir}/../../lib/bcmail-jdk15-134.jar</systemPath>
+ </dependency>
+ <dependency>
+ <groupId>jline</groupId>
+ <artifactId>jline</artifactId>
+ <version>0.9.91-SNAPSHOT</version>
+ <scope>system</scope>
+ <systemPath>${project.basedir}/../../lib/jline-0.9.91-SNAPSHOT.jar</systemPath>
+ </dependency>
+ <dependency>
+ <groupId>requireTest</groupId>
+ <artifactId>requireTest</artifactId>
+ <version>SNAPSHOT</version>
+ <scope>system</scope>
+ <systemPath>${project.basedir}/../../test/requireTest.jar</systemPath>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <sourceDirectory>${project.basedir}/../../src</sourceDirectory>
+ <testSourceDirectory>${project.basedir}/../../test</testSourceDirectory>
+ <resources>
+ <resource>
+ <directory>${project.basedir}/../../src</directory>
+ <includes>
+ <include>**/*.rb</include>
+ <include>**/*.properties</include>
+ </includes>
+ <excludes>
+ <exclude>builtin/**/*.rb</exclude>
+ </excludes>
+ </resource>
+ </resources>
+ <testResources>
+ <testResource>
+ <directory>${project.basedir}/../..</directory>
+ <includes>
+ <include>test/**/*.rb</include>
+ <include>test/test_index</include>
+ <include>test/test_unit_index</include>
+ <include>test/RubyInitTest.jar</include>
+ <include>test/requireTarget.jar</include>
+ </includes>
+ </testResource>
+ <testResource>
+ <directory>${project.basedir}/../../test</directory>
+ <includes>
+ <include>org/jruby/**/*.rb</include>
+ </includes>
+ </testResource>
+ </testResources>
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <includes>
+ <include>org/jruby/test/MainTestSuite.java</include>
+ <!-- <include>org/jruby/test/ScriptTestSuite.java</include> -->
+ <!-- <include>org/jruby/test/TestUnitTestSuite.java</include> -->
+ </includes>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>unjar-deps</id>
+ <phase>process-resources</phase>
+ <configuration>
+ <tasks>
+ <unjar src="${project.basedir}/../../lib/plaincharset.jar" dest="${project.build.outputDirectory}"/>
+ <unjar src="${project.basedir}/../../lib/jvyaml.jar" dest="${project.build.outputDirectory}"/>
+ <delete file="${project.build.outputDirectory}/META-INF/MANIFEST.MF"/>
+ <mkdir dir="${project.build.outputDirectory}/META-INF/jruby.home"/>
+ <copy todir="${project.build.outputDirectory}/META-INF/jruby.home">
+ <fileset dir="${project.basedir}/../..">
+ <include name="bin/*"/>
+ <include name="lib/ruby/gems/**/*"/>
+ <include name="lib/ruby/site_ruby/**/*"/>
+ </fileset>
+ </copy>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>serialize</id>
+ <phase>process-classes</phase>
+ <configuration>
+ <tasks>
+ <taskdef name="jruby-serialize" classname="org.jruby.util.ant.JRubySerialize">
+ <classpath path="${project.build.outputDirectory}"/>
+ </taskdef>
+ <jruby-serialize destdir="${project.build.outputDirectory}">
+ <fileset dir="${project.build.sourceDirectory}">
+ <include name="builtin/**/*.rb"/>
+ </fileset>
+ </jruby-serialize>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>jarjar</id>
+ <phase>package</phase>
+ <configuration>
+ <tasks>
+ <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask"
+ classpath="${project.basedir}/../../lib/jarjar-0.7.jar"/>
+ <delete file="${project.build.directory}/${project.build.finalName}.jar"/>
+ <jarjar destfile="${project.build.directory}/${project.build.finalName}.jar">
+ <fileset dir="${project.build.outputDirectory}">
+ <include name="META-INF/jruby.home/**/*"/>
+ <include name="META-INF/**/*"/>
+ <include name="**/*.class"/>
+ <include name="**/*.properties"/>
+ <include name="**/*.rb"/>
+ <include name="**/*.rb.ast.ser"/>
+ <exclude name="org/jruby/util/ant/**/*.class"/>
+ </fileset>
+ <fileset dir="${project.basedir}/../../lib/ruby/1.8">
+ <include name="**/*.rb"/>
+ </fileset>
+ <zipfileset src="${project.basedir}/../../lib/asm-2.2.2.jar"/>
+ <zipfileset src="${project.basedir}/../../lib/jline-0.9.91-SNAPSHOT.jar"/>
+ <manifest>
+ <attribute name="Built-By" value="${user.name}"/>
+ <attribute name="Main-Class" value="${jruby.main.class}"/>
+ </manifest>
+ </jarjar>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
+
Oops, something went wrong.

0 comments on commit 76eb037

Please sign in to comment.