incubator-kato-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From monte...@apache.org
Subject svn commit: r834988 - in /incubator/kato/trunk/org.apache.kato: ./ kato.distro/ kato.distro/kato.native.distro/ kato.distro/kato.native.distro/kato.native.distro/ kato.distro/kato.native.distro/kato.native.distro/src/ kato.distro/kato.native.distro/kat...
Date Wed, 11 Nov 2009 18:02:33 GMT
Author: monteith
Date: Wed Nov 11 18:02:32 2009
New Revision: 834988

URL: http://svn.apache.org/viewvc?rev=834988&view=rev
Log:
Add kato.native.distro packaging.

Added:
    incubator/kato/trunk/org.apache.kato/kato.distro/kato.native.distro/   (with props)
    incubator/kato/trunk/org.apache.kato/kato.distro/kato.native.distro/kato.native.distro/
    incubator/kato/trunk/org.apache.kato/kato.distro/kato.native.distro/kato.native.distro/pom.xml
    incubator/kato/trunk/org.apache.kato/kato.distro/kato.native.distro/kato.native.distro/src/
    incubator/kato/trunk/org.apache.kato/kato.distro/kato.native.distro/kato.native.distro/src/main/
    incubator/kato/trunk/org.apache.kato/kato.distro/kato.native.distro/kato.native.distro/src/main/assembly/
    incubator/kato/trunk/org.apache.kato/kato.distro/kato.native.distro/kato.native.distro/src/main/assembly/nativebin.xml
    incubator/kato/trunk/org.apache.kato/kato.distro/kato.native.distro/kato.native.distro/src/test/
    incubator/kato/trunk/org.apache.kato/kato.distro/kato.native.distro/pom.xml
    incubator/kato/trunk/org.apache.kato/kato.distro/kato.native.distro/src/
    incubator/kato/trunk/org.apache.kato/kato.distro/kato.native.distro/src/main/
    incubator/kato/trunk/org.apache.kato/kato.distro/kato.native.distro/src/main/assembly/
    incubator/kato/trunk/org.apache.kato/kato.distro/kato.native.distro/src/main/assembly/nativebin.xml
    incubator/kato/trunk/org.apache.kato/kato.distro/kato.native.distro/src/test/
Modified:
    incubator/kato/trunk/org.apache.kato/kato.distro/pom.xml
    incubator/kato/trunk/org.apache.kato/kato.native/kato.native.cjvmti/linux-x86/pom.xml
    incubator/kato/trunk/org.apache.kato/kato.native/kato.native.cjvmti/win32/pom.xml
    incubator/kato/trunk/org.apache.kato/kato.native/kato.native.vmapi/javah/   (props changed)
    incubator/kato/trunk/org.apache.kato/kato.native/kato.native.vmapi/linux-x86/   (props
changed)
    incubator/kato/trunk/org.apache.kato/pom.xml

Propchange: incubator/kato/trunk/org.apache.kato/kato.distro/kato.native.distro/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Nov 11 18:02:32 2009
@@ -0,0 +1 @@
+target

Added: incubator/kato/trunk/org.apache.kato/kato.distro/kato.native.distro/kato.native.distro/pom.xml
URL: http://svn.apache.org/viewvc/incubator/kato/trunk/org.apache.kato/kato.distro/kato.native.distro/kato.native.distro/pom.xml?rev=834988&view=auto
==============================================================================
--- incubator/kato/trunk/org.apache.kato/kato.distro/kato.native.distro/kato.native.distro/pom.xml
(added)
+++ incubator/kato/trunk/org.apache.kato/kato.distro/kato.native.distro/kato.native.distro/pom.xml
Wed Nov 11 18:02:32 2009
@@ -0,0 +1,100 @@
+<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">
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+-->
+
+  <parent>
+    <artifactId>kato</artifactId>
+    <groupId>org.apache.kato</groupId>
+    <version>M1-incubating</version>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.apache.kato</groupId>
+  <artifactId>kato.native.distro</artifactId>
+  <packaging>pom</packaging>
+  <version>M1-incubating</version>
+  <name>Kato native runtime distribution packaging</name>
+  
+  <!--  List dependencies here for consideration by the
+        assembly plugin 
+   -->
+<!-- configures the dependencies needed for building native code on this platform.
+     Also sets the format of the archive that includes native package
+   -->
+  <profiles>
+	 <profile>
+      <id>linux-x86</id>
+      <activation>
+        <os>
+          <family>Linux</family>
+          <arch>i386</arch>
+        </os>
+      </activation>
+    <dependencies>
+  	    <dependency>
+  		    <artifactId>cjvmti-Linux-x86</artifactId>
+      		<groupId>org.apache.kato.native</groupId>
+  	    	<version>M1-incubating</version>
+  		    <type>so</type>
+      	</dependency>
+  </dependencies>
+        <properties>
+            <assembly.format>tar.gz</assembly.format>
+        </properties>
+    </profile>
+
+    <profile>
+      <id>windows-32</id>
+      <activation>
+        <os>
+          <family>windows</family>
+          <arch>x86</arch>
+        </os>
+      </activation>
+    <dependencies>
+  	    <dependency>
+  		    <artifactId>cjvmti-windows-x86</artifactId>
+      		<groupId>org.apache.kato.native</groupId>
+  	    	<version>M1-incubating</version>
+  		    <type>dll</type>
+      	</dependency>
+  </dependencies>
+        <properties>
+            <assembly.format>zip</assembly.format>
+        </properties>
+    </profile>
+    </profile>
+
+  </profiles>
+ 
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-assembly-plugin</artifactId>
+       			<configuration>
+       			<finalName>apache-kato-${project.version}</finalName>
+       			   <descriptors>
+       				     <descriptor>src/main/assembly/nativebin.xml</descriptor>
+       			   </descriptors>
+      		  	</configuration>
+         	
+        </plugin>
+    </plugins>
+  </build>
+  
+</project>

Added: incubator/kato/trunk/org.apache.kato/kato.distro/kato.native.distro/kato.native.distro/src/main/assembly/nativebin.xml
URL: http://svn.apache.org/viewvc/incubator/kato/trunk/org.apache.kato/kato.distro/kato.native.distro/kato.native.distro/src/main/assembly/nativebin.xml?rev=834988&view=auto
==============================================================================
--- incubator/kato/trunk/org.apache.kato/kato.distro/kato.native.distro/kato.native.distro/src/main/assembly/nativebin.xml
(added)
+++ incubator/kato/trunk/org.apache.kato/kato.distro/kato.native.distro/kato.native.distro/src/main/assembly/nativebin.xml
Wed Nov 11 18:02:32 2009
@@ -0,0 +1,65 @@
+<?xml version="1.0"?>
+<!--
+
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    * KIND, either express or implied.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.
+-->
+<assembly>
+  <id>native-bin-${os.name}-${os.arch}</id>
+  <baseDirectory>kato-${project.version}</baseDirectory>
+  <formats>
+    <format>${assembly.format}</format>
+  </formats>
+  <fileSets>
+
+    <!--
+        Place readme into base directory, including other docs.
+    -->
+    <fileSet>
+      <directory>src/main/readme/</directory>
+      <outputDirectory>/</outputDirectory>
+    </fileSet>
+
+    <!--
+        Places the disclaimer, licence and notice files
+        from the project directory into the binary base directory.
+    -->
+    <fileSet>
+        <directory>../..</directory>
+        <outputDirectory>/</outputDirectory>
+        <includes>
+            <include>DISCLAIMER.txt</include>
+            <include>NOTICE</include>
+            <include>LICENSE</include>
+        </includes>
+      <fileMode>644</fileMode>
+    </fileSet>
+
+  </fileSets>
+
+  <dependencySets>
+  <!--
+	Includes libraries into directory
+    -->
+    <dependencySet>
+      <outputDirectory>lib</outputDirectory>
+      <unpack>false</unpack>
+      <scope>compile</scope>
+    </dependencySet>
+
+  </dependencySets>
+</assembly>

Added: incubator/kato/trunk/org.apache.kato/kato.distro/kato.native.distro/pom.xml
URL: http://svn.apache.org/viewvc/incubator/kato/trunk/org.apache.kato/kato.distro/kato.native.distro/pom.xml?rev=834988&view=auto
==============================================================================
--- incubator/kato/trunk/org.apache.kato/kato.distro/kato.native.distro/pom.xml (added)
+++ incubator/kato/trunk/org.apache.kato/kato.distro/kato.native.distro/pom.xml Wed Nov 11
18:02:32 2009
@@ -0,0 +1,99 @@
+<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">
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+-->
+
+  <parent>
+    <artifactId>kato</artifactId>
+    <groupId>org.apache.kato</groupId>
+    <version>M1-incubating</version>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.apache.kato</groupId>
+  <artifactId>kato.native.distro</artifactId>
+  <packaging>pom</packaging>
+  <version>M1-incubating</version>
+  <name>Kato native runtime distribution packaging</name>
+  
+  <!--  List dependencies here for consideration by the
+        assembly plugin 
+   -->
+<!-- configures the dependencies needed for building native code on this platform.
+     Also sets the format of the archive that includes native package
+   -->
+  <profiles>
+	 <profile>
+      <id>linux-x86</id>
+      <activation>
+        <os>
+          <family>Linux</family>
+          <arch>i386</arch>
+        </os>
+      </activation>
+    <dependencies>
+  	    <dependency>
+  		    <artifactId>libcjvmti-Linux-x86</artifactId>
+      		<groupId>org.apache.kato.native</groupId>
+  	    	<version>M1-incubating</version>
+  		    <type>so</type>
+      	</dependency>
+  </dependencies>
+        <properties>
+            <assembly.format>tar.gz</assembly.format>
+        </properties>
+    </profile>
+
+    <profile>
+      <id>windows-32</id>
+      <activation>
+        <os>
+          <family>windows</family>
+          <arch>x86</arch>
+        </os>
+      </activation>
+    <dependencies>
+  	    <dependency>
+  		    <artifactId>cjvmti-windows-x86</artifactId>
+      		<groupId>org.apache.kato.native</groupId>
+  	    	<version>M1-incubating</version>
+  		    <type>dll</type>
+      	</dependency>
+  </dependencies>
+        <properties>
+            <assembly.format>zip</assembly.format>
+        </properties>
+    </profile>
+
+  </profiles>
+ 
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-assembly-plugin</artifactId>
+       			<configuration>
+       			<finalName>apache-kato-${project.version}</finalName>
+       			   <descriptors>
+       				     <descriptor>src/main/assembly/nativebin.xml</descriptor>
+       			   </descriptors>
+      		  	</configuration>
+         	
+        </plugin>
+    </plugins>
+  </build>
+  
+</project>

Added: incubator/kato/trunk/org.apache.kato/kato.distro/kato.native.distro/src/main/assembly/nativebin.xml
URL: http://svn.apache.org/viewvc/incubator/kato/trunk/org.apache.kato/kato.distro/kato.native.distro/src/main/assembly/nativebin.xml?rev=834988&view=auto
==============================================================================
--- incubator/kato/trunk/org.apache.kato/kato.distro/kato.native.distro/src/main/assembly/nativebin.xml
(added)
+++ incubator/kato/trunk/org.apache.kato/kato.distro/kato.native.distro/src/main/assembly/nativebin.xml
Wed Nov 11 18:02:32 2009
@@ -0,0 +1,65 @@
+<?xml version="1.0"?>
+<!--
+
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    * KIND, either express or implied.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.
+-->
+<assembly>
+  <id>native-bin-${os.name}-${os.arch}</id>
+  <baseDirectory>kato-${project.version}</baseDirectory>
+  <formats>
+    <format>${assembly.format}</format>
+  </formats>
+  <fileSets>
+
+    <!--
+        Place readme into base directory, including other docs.
+    -->
+    <fileSet>
+      <directory>src/main/readme/</directory>
+      <outputDirectory>/</outputDirectory>
+    </fileSet>
+
+    <!--
+        Places the disclaimer, licence and notice files
+        from the project directory into the binary base directory.
+    -->
+    <fileSet>
+        <directory>../..</directory>
+        <outputDirectory>/</outputDirectory>
+        <includes>
+            <include>DISCLAIMER.txt</include>
+            <include>NOTICE</include>
+            <include>LICENSE</include>
+        </includes>
+      <fileMode>644</fileMode>
+    </fileSet>
+
+  </fileSets>
+
+  <dependencySets>
+  <!--
+	Includes libraries into directory
+    -->
+    <dependencySet>
+      <outputDirectory>lib</outputDirectory>
+      <unpack>false</unpack>
+      <scope>compile</scope>
+    </dependencySet>
+
+  </dependencySets>
+</assembly>

Modified: incubator/kato/trunk/org.apache.kato/kato.distro/pom.xml
URL: http://svn.apache.org/viewvc/incubator/kato/trunk/org.apache.kato/kato.distro/pom.xml?rev=834988&r1=834987&r2=834988&view=diff
==============================================================================
--- incubator/kato/trunk/org.apache.kato/kato.distro/pom.xml (original)
+++ incubator/kato/trunk/org.apache.kato/kato.distro/pom.xml Wed Nov 11 18:02:32 2009
@@ -100,14 +100,14 @@
     <plugins>
       <plugin>
         <artifactId>maven-assembly-plugin</artifactId>
-        <executions>
+        <!--<executions>
         	<execution>
         		<phase>compile</phase>
         		<goals>
         			<goal>assembly</goal>
         		</goals>
         	</execution>
-        </executions>
+        </executions>-->
        			<configuration>
        			<finalName>apache-kato-${project.version}</finalName>
        			   <descriptors>

Modified: incubator/kato/trunk/org.apache.kato/kato.native/kato.native.cjvmti/linux-x86/pom.xml
URL: http://svn.apache.org/viewvc/incubator/kato/trunk/org.apache.kato/kato.native/kato.native.cjvmti/linux-x86/pom.xml?rev=834988&r1=834987&r2=834988&view=diff
==============================================================================
--- incubator/kato/trunk/org.apache.kato/kato.native/kato.native.cjvmti/linux-x86/pom.xml
(original)
+++ incubator/kato/trunk/org.apache.kato/kato.native/kato.native.cjvmti/linux-x86/pom.xml
Wed Nov 11 18:02:32 2009
@@ -29,20 +29,12 @@
   </parent>
 
   <groupId>org.apache.kato.native</groupId>
-  
-  
-    
-    
-   <artifactId>libcjvmti</artifactId>
+  <artifactId>libcjvmti-Linux-x86</artifactId>
   
   <name>Linux X86 Version of CJVMTI Native Library</name>
   
   <packaging>so</packaging>
   
-  
-  
-  
-  
   <build>
     <plugins>
       <plugin>

Modified: incubator/kato/trunk/org.apache.kato/kato.native/kato.native.cjvmti/win32/pom.xml
URL: http://svn.apache.org/viewvc/incubator/kato/trunk/org.apache.kato/kato.native/kato.native.cjvmti/win32/pom.xml?rev=834988&r1=834987&r2=834988&view=diff
==============================================================================
--- incubator/kato/trunk/org.apache.kato/kato.native/kato.native.cjvmti/win32/pom.xml (original)
+++ incubator/kato/trunk/org.apache.kato/kato.native/kato.native.cjvmti/win32/pom.xml Wed
Nov 11 18:02:32 2009
@@ -29,11 +29,7 @@
   </parent>
 
   <groupId>org.apache.kato.native</groupId>
-  
-  
-    
-    
-   <artifactId>cjvmti</artifactId>
+   <artifactId>cjvmti-windows-x86</artifactId>
   
   <name>Win32 Version of CJVMTI Native Library</name>
   

Propchange: incubator/kato/trunk/org.apache.kato/kato.native/kato.native.vmapi/javah/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Nov 11 18:02:32 2009
@@ -0,0 +1 @@
+target

Propchange: incubator/kato/trunk/org.apache.kato/kato.native/kato.native.vmapi/linux-x86/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Nov 11 18:02:32 2009
@@ -0,0 +1 @@
+target

Modified: incubator/kato/trunk/org.apache.kato/pom.xml
URL: http://svn.apache.org/viewvc/incubator/kato/trunk/org.apache.kato/pom.xml?rev=834988&r1=834987&r2=834988&view=diff
==============================================================================
--- incubator/kato/trunk/org.apache.kato/pom.xml (original)
+++ incubator/kato/trunk/org.apache.kato/pom.xml Wed Nov 11 18:02:32 2009
@@ -52,6 +52,17 @@
 		
 		
 	</modules>
+	<repositories>
+	<repository>
+		<id>apache.incubator</id>
+		<name>Apache Incubator Repository</name>
+		<url>http://people.apache.org/repo/m2-incubating-repository</url>
+		<releases>
+			<enabled>true</enabled>
+			<updatePolicy>true</updatePolicy>
+		</releases>
+		</repository>
+	</repositories>
 	<build>
 		<plugins>
 			<plugin>
@@ -76,7 +87,7 @@
                 </configuration>
             </plugin>
 
-		</plugins>
+	</plugins>
 
         <resources>
             <!-- Add NOTICEs, etc. to jars under META-INF directory. -->



Mime
View raw message