incubator-kato-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From spo...@apache.org
Subject svn commit: r785026 - in /incubator/kato/branches/experimental/maven_restructure/org.apache.kato/org.apache.kato.pyjvmti: .project pom.xml src/ src/setup.py
Date Mon, 15 Jun 2009 23:26:27 GMT
Author: spoole
Date: Mon Jun 15 23:26:27 2009
New Revision: 785026

URL: http://svn.apache.org/viewvc?rev=785026&view=rev
Log:
redo pyjvmti build in maven

Modified:
    incubator/kato/branches/experimental/maven_restructure/org.apache.kato/org.apache.kato.pyjvmti/.project
    incubator/kato/branches/experimental/maven_restructure/org.apache.kato/org.apache.kato.pyjvmti/pom.xml
    incubator/kato/branches/experimental/maven_restructure/org.apache.kato/org.apache.kato.pyjvmti/src/
  (props changed)
    incubator/kato/branches/experimental/maven_restructure/org.apache.kato/org.apache.kato.pyjvmti/src/setup.py

Modified: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/org.apache.kato.pyjvmti/.project
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/maven_restructure/org.apache.kato/org.apache.kato.pyjvmti/.project?rev=785026&r1=785025&r2=785026&view=diff
==============================================================================
--- incubator/kato/branches/experimental/maven_restructure/org.apache.kato/org.apache.kato.pyjvmti/.project
(original)
+++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/org.apache.kato.pyjvmti/.project
Mon Jun 15 23:26:27 2009
@@ -6,6 +6,11 @@
 	</projects>
 	<buildSpec>
 		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
 			<name>org.python.pydev.PyDevBuilder</name>
 			<arguments>
 			</arguments>
@@ -17,6 +22,7 @@
 		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.maven.ide.eclipse.maven2Nature</nature>
 		<nature>org.python.pydev.pythonNature</nature>
 	</natures>

Modified: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/org.apache.kato.pyjvmti/pom.xml
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/maven_restructure/org.apache.kato/org.apache.kato.pyjvmti/pom.xml?rev=785026&r1=785025&r2=785026&view=diff
==============================================================================
--- incubator/kato/branches/experimental/maven_restructure/org.apache.kato/org.apache.kato.pyjvmti/pom.xml
(original)
+++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/org.apache.kato.pyjvmti/pom.xml
Mon Jun 15 23:26:27 2009
@@ -12,43 +12,30 @@
 	<version>0.0.1-SNAPSHOT</version>
 	<build>
 		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-antrun-plugin</artifactId>
-				<version>1.3</version>
-				<executions>
-					<execution>
-						<id>build jvmti agent</id>
-						<phase>compile</phase>
-						<goals>
-							<goal>run</goal>
-						</goals>
-						<configuration>
-							<tasks>
-								<property name="dirpath" value="${sdk.install.dir}" />
-								<echoproperties/>
-								<path id="dir">
-									<dirset dir="${dirpath}" />
-								</path>
-
-								<property name="includes" refid="dir" />
-
-								<exec executable="python" dir="src">
-									<env key="DIRS" value="${includes}" />
-									<arg value="-u" />
-									<arg value="setup.py" />
-									<arg value="build" />
-
-								</exec>
-
-
-
-							</tasks>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>exec-maven-plugin</artifactId>
+        <version>1.1</version>
+        <executions>
+          <execution>
+          <phase>compile</phase>
+            <goals>
+              <goal>exec</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <executable>python</executable>
+          <workingDirectory>src</workingDirectory>
+          <arguments>
+            <argument>setup.py</argument>
+            <argument>${sdk.install.dir}</argument>
+            <argument>build</argument>
+          </arguments>
+          
+        </configuration>
+      </plugin>
+    </plugins>
+			</build>
 
 </project>
\ No newline at end of file

Propchange: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/org.apache.kato.pyjvmti/src/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Jun 15 23:26:27 2009
@@ -0,0 +1 @@
+build

Modified: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/org.apache.kato.pyjvmti/src/setup.py
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/maven_restructure/org.apache.kato/org.apache.kato.pyjvmti/src/setup.py?rev=785026&r1=785025&r2=785026&view=diff
==============================================================================
--- incubator/kato/branches/experimental/maven_restructure/org.apache.kato/org.apache.kato.pyjvmti/src/setup.py
(original)
+++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/org.apache.kato.pyjvmti/src/setup.py
Mon Jun 15 23:26:27 2009
@@ -13,12 +13,30 @@
  #******************************************************************************"
 
 # This setup file is expected to be driven by the projects build.xml ant script
-from distutils.core import setup, Extension
+
 import os
+import sys
+
+
+sdkdir=sys.argv[1];
+
+print "using sdkdir=%s" % sdkdir
+
+sys.argv.remove(sdkdir)
+
+from distutils.core import setup, Extension
+
+dirlist = list()
+for root, dirs, files in os.walk(sdkdir):
+   for name in dirs:       
+       filename = os.path.join(root, name)
+       dirlist.append(filename)
+
+
+
 
-dirs=os.environ['DIRS'].split(':')
 
-print "using include path of " , dirs
+print "using include path of " , dirlist
 
 module1 = Extension('libpyjvmti',
                     sources = ['pyjvmti.c'])
@@ -27,7 +45,7 @@
 setup (name = 'jvmti',
        version = '1.0',
        description = 'JVMTI Wrapper',
-       include_dirs = dirs ,
+       include_dirs = dirlist ,
        url = 'http://incubator.apache.org/kato/site',
        author = "Steve Poole" ,
        author_email="spoole167@googlemail.com" ,



Mime
View raw message