incubator-accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vi...@apache.org
Subject svn commit: r1208809 - in /incubator/accumulo/trunk/src: assemble/dist.xml assemble/pom.xml server/pom.xml
Date Wed, 30 Nov 2011 21:39:12 GMT
Author: vines
Date: Wed Nov 30 21:39:11 2011
New Revision: 1208809

URL: http://svn.apache.org/viewvc?rev=1208809&view=rev
Log:
ACCUMULO-161 mvn package -Pdist will now generate the native code. I also added proper support
for ignoring the osx native maps, which are .jnilib and not .so

Modified:
    incubator/accumulo/trunk/src/assemble/dist.xml
    incubator/accumulo/trunk/src/assemble/pom.xml
    incubator/accumulo/trunk/src/server/pom.xml

Modified: incubator/accumulo/trunk/src/assemble/dist.xml
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/assemble/dist.xml?rev=1208809&r1=1208808&r2=1208809&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/assemble/dist.xml (original)
+++ incubator/accumulo/trunk/src/assemble/dist.xml Wed Nov 30 21:39:11 2011
@@ -83,7 +83,8 @@
 				<exclude>**/randomwalk/conf/logger.xml</exclude>
 				<exclude>**/randomwalk/conf/randomwalk.conf</exclude>
 				<exclude>**/randomwalk/conf/walkers</exclude>
-				<exclude>src/**/*.so</exclude>
+        		<exclude>${extraInclude}</exclude>
+        		<exclude>${extraInclude2}</exclude>
 			</excludes>
 			<fileMode>0644</fileMode>
 			<directoryMode>0755</directoryMode>

Modified: incubator/accumulo/trunk/src/assemble/pom.xml
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/assemble/pom.xml?rev=1208809&r1=1208808&r2=1208809&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/assemble/pom.xml (original)
+++ incubator/accumulo/trunk/src/assemble/pom.xml Wed Nov 30 21:39:11 2011
@@ -19,213 +19,222 @@
 		<relativePath>../..</relativePath>
 	</parent>
 
-
-	<modelVersion>4.0.0</modelVersion>
-	<artifactId>accumulo-assemble</artifactId>
-	<name>accumulo-assemble</name>
-
-	<packaging>pom</packaging>
-
-	<!-- NOTE: These dependency declarations are only required to sort this 
-		project to the end of the line in the multimodule build. Since we only include 
-		the child1 module in our assembly, we only need to ensure this distribution 
-		project builds AFTER that one... -->
-	<dependencies>
-		<dependency>
-			<groupId>org.apache.accumulo</groupId>
-			<artifactId>accumulo-core</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.accumulo</groupId>
-			<artifactId>accumulo-server</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.accumulo</groupId>
-			<artifactId>accumulo-start</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.accumulo</groupId>
-			<artifactId>accumulo-examples</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.accumulo</groupId>
-			<artifactId>cloudtrace</artifactId>
-		</dependency>
-	</dependencies>
-
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>exec-maven-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>user-manual</id>
-						<phase>prepare-package</phase>
-						<goals>
-							<goal>exec</goal>
-						</goals>
-						<configuration>
-							<executable>bash</executable>
-							<arguments>
-								<argument>../../docs/src/user_manual/build.sh</argument>
-							</arguments>
-						</configuration>
-					</execution>
-					<execution>
-						<id>config webpage</id>
-						<phase>package</phase>
-						<goals>
-							<goal>exec</goal>
-						</goals>
-						<configuration>
-							<executable>bash</executable>
-							<arguments>
-								<argument>docgen.sh</argument>
-							</arguments>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<artifactId>maven-assembly-plugin</artifactId>
-				<configuration>
-					<descriptors>
-						<descriptor>src/assemble/dist.xml</descriptor>
-					</descriptors>
-					<tarLongFileMode>gnu</tarLongFileMode>
-				</configuration>
-				<executions>
-					<execution>
-						<id>distro-assembly</id>
-						<phase>package</phase>
-						<goals>
-							<goal>single</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
-
-	<profiles>
-		<profile>
-			<id>rpm</id>
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>org.codehaus.mojo</groupId>
-						<artifactId>rpm-maven-plugin</artifactId>
-						<inherited>false</inherited>
-						<executions>
-							<execution>
-								<phase>package</phase>
-								<goals>
-									<goal>rpm</goal>
-								</goals>
-							</execution>
-						</executions>
-						<configuration>
-							<name>accumulo</name>
-							<projversion>${project.version}</projversion>
-							<summary>Accumulo BigTable clone</summary>
-							<description>
-								Accumulo is a large distributed structured store based on Google's
-								BigTable design.
-							</description>
-							<copyright>2011 The Apache Software Foundation.</copyright>
-							<url>http://incubator.apache.org/accumulo</url>
-							<needarch>true</needarch>
-							<group>Utilities</group>
-							<requires>
-								<require>jdk</require>
-								<require>hadoop</require>
-								<require>zookeeper</require>
-							</requires>
-							<prefix>/opt/accumulo</prefix>
-							<defaultDirmode>755</defaultDirmode>
-							<defaultFilemode>644</defaultFilemode>
-							<defaultUsername>root</defaultUsername>
-							<defaultGroupname>root</defaultGroupname>
-							<mappings>
-								<mapping>
-									<directory>/opt/accumulo/accumulo-${project.version}</directory>
-									<sources>
-										<source>
-											<location>${project.parent.relativePath}/README</location>
-										</source>
-									</sources>
-								</mapping>
-								<mapping>
-									<directory>/opt/accumulo/accumulo-${project.version}/docs</directory>
-									<sources>
-										<source>
-											<location>${project.parent.relativePath}/docs</location>
-										</source>
-									</sources>
-								</mapping>
-								<mapping>
-									<directory>/opt/accumulo/accumulo-${project.version}/test</directory>
-									<sources>
-										<source>
-											<location>${project.parent.relativePath}/test</location>
-											<excludes>
-												<exclude>${project.parent.relativePath}/**/walkers.txt</exclude>
-												<exclude>${project.parent.relativePath}/**/ingesters.txt</exclude>
-												<exclude>${project.parent.relativePath}/**/continuous-env.sh</exclude>
-												<exclude>${project.parent.relativePath}/**/*.pyc</exclude>
-											</excludes>
-										</source>
-									</sources>
-								</mapping>
-								<mapping>
-									<directory>/opt/accumulo/accumulo-${project.version}/bin</directory>
-								</mapping>
-								<mapping>
-									<directory>/opt/accumulo/accumulo-${project.version}/bin</directory>
-									<directoryIncluded>false</directoryIncluded>
-									<filemode>755</filemode>
-									<username>root</username>
-									<groupname>root</groupname>
-									<sources>
-										<source>
-											<location>${project.parent.relativePath}/bin</location>
-										</source>
-									</sources>
-								</mapping>
-								<mapping>
-									<directory>/opt/accumulo/accumulo-${project.version}/conf</directory>
-									<sources>
-										<source>
-											<location>${project.parent.relativePath}/conf</location>
-											<excludes>
-												<exclude>${project.parent.relativePath}/**/accumulo-site.xml</exclude>
-												<exclude>${project.parent.relativePath}/**/accumulo-env.sh</exclude>
-												<exclude>${project.parent.relativePath}/**/accumulo-metrics.xml</exclude>
-												<exclude>${project.parent.relativePath}/**/test-*</exclude>
-												<exclude>${project.parent.relativePath}/**/slaves</exclude>
-												<exclude>${project.parent.relativePath}/**/masters</exclude>
-												<exclude>${project.parent.relativePath}/**/tracers</exclude>
-												<exclude>${project.parent.relativePath}/**/gc</exclude>
-												<exclude>${project.parent.relativePath}/**/monitor</exclude>
-											</excludes>
-										</source>
-									</sources>
-								</mapping>
-								<mapping>
-									<directory>/opt/accumulo/accumulo-${project.version}/lib</directory>
-									<dependency />
-									<sources>
-										<source>
-											<location>${project.parent.relativePath}/lib</location>
-										</source>
-									</sources>
-								</mapping>
-							</mappings>
-						</configuration>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
-	</profiles>
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>accumulo-assemble</artifactId>
+  <name>accumulo-assemble</name>
+
+  <packaging>pom</packaging>
+
+  <!-- NOTE: These dependency declarations are only required to sort this project to the
end of the line in the multimodule build. Since we only include the child1 
+    module in our assembly, we only need to ensure this distribution project builds AFTER
that one... -->
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.accumulo</groupId>
+      <artifactId>accumulo-core</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.accumulo</groupId>
+      <artifactId>accumulo-server</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.accumulo</groupId>
+      <artifactId>accumulo-start</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.accumulo</groupId>
+      <artifactId>accumulo-examples</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.accumulo</groupId>
+      <artifactId>cloudtrace</artifactId>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>exec-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>user-manual</id>
+            <phase>prepare-package</phase>
+            <goals>
+              <goal>exec</goal>
+            </goals>
+            <configuration>
+              <executable>bash</executable>
+              <arguments>
+                <argument>../../docs/src/user_manual/build.sh</argument>
+              </arguments>
+            </configuration>
+          </execution>
+          <execution>
+            <id>config webpage</id>
+            <phase>package</phase>
+            <goals>
+              <goal>exec</goal>
+            </goals>
+            <configuration>
+              <executable>bash</executable>
+              <arguments>
+                <argument>docgen.sh</argument>
+              </arguments>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <configuration>
+          <descriptors>
+            <descriptor>src/assemble/dist.xml</descriptor>
+          </descriptors>
+          <tarLongFileMode>gnu</tarLongFileMode>
+        </configuration>
+        <executions>
+          <execution>
+            <id>distro-assembly</id>
+            <phase>package</phase>
+            <goals>
+              <goal>single</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+
+  <properties>
+    <extraInclude>src/**/*.so</extraInclude>
+    <extraInclude2>src/**/*.jnilib</extraInclude2>
+  </properties>
+
+  <profiles>
+    <profile>
+      <id>dist</id>
+      <properties>
+        <extraInclude></extraInclude>
+        <extraInclude2></extraInclude2>
+      </properties>
+    </profile>
+    <profile>
+      <id>rpm</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>rpm-maven-plugin</artifactId>
+            <inherited>false</inherited>
+            <executions>
+              <execution>
+                <phase>package</phase>
+                <goals>
+                  <goal>rpm</goal>
+                </goals>
+              </execution>
+            </executions>
+            <configuration>
+              <name>accumulo</name>
+              <projversion>${project.version}</projversion>
+              <summary>Accumulo BigTable clone</summary>
+              <description>
+                Accumulo is a large distributed structured store based on Google's
+                BigTable design.
+              </description>
+              <copyright>2011 The Apache Software Foundation.</copyright>
+              <url>http://incubator.apache.org/accumulo</url>
+              <needarch>true</needarch>
+              <group>Utilities</group>
+              <requires>
+                <require>jdk</require>
+                <require>hadoop</require>
+                <require>zookeeper</require>
+              </requires>
+              <prefix>/opt/accumulo</prefix>
+              <defaultDirmode>755</defaultDirmode>
+              <defaultFilemode>644</defaultFilemode>
+              <defaultUsername>root</defaultUsername>
+              <defaultGroupname>root</defaultGroupname>
+              <mappings>
+                <mapping>
+                  <directory>/opt/accumulo/accumulo-${project.version}</directory>
+                  <sources>
+                    <source>
+                      <location>${project.parent.relativePath}/README</location>
+                    </source>
+                  </sources>
+                </mapping>
+                <mapping>
+                  <directory>/opt/accumulo/accumulo-${project.version}/docs</directory>
+                  <sources>
+                    <source>
+                      <location>${project.parent.relativePath}/docs</location>
+                    </source>
+                  </sources>
+                </mapping>
+                <mapping>
+                  <directory>/opt/accumulo/accumulo-${project.version}/test</directory>
+                  <sources>
+                    <source>
+                      <location>${project.parent.relativePath}/test</location>
+                      <excludes>
+                        <exclude>${project.parent.relativePath}/**/walkers.txt</exclude>
+                        <exclude>${project.parent.relativePath}/**/ingesters.txt</exclude>
+                        <exclude>${project.parent.relativePath}/**/continuous-env.sh</exclude>
+                        <exclude>${project.parent.relativePath}/**/*.pyc</exclude>
+                      </excludes>
+                    </source>
+                  </sources>
+                </mapping>
+                <mapping>
+                  <directory>/opt/accumulo/accumulo-${project.version}/bin</directory>
+                </mapping>
+                <mapping>
+                  <directory>/opt/accumulo/accumulo-${project.version}/bin</directory>
+                  <directoryIncluded>false</directoryIncluded>
+                  <filemode>755</filemode>
+                  <username>root</username>
+                  <groupname>root</groupname>
+                  <sources>
+                    <source>
+                      <location>${project.parent.relativePath}/bin</location>
+                    </source>
+                  </sources>
+                </mapping>
+                <mapping>
+                  <directory>/opt/accumulo/accumulo-${project.version}/conf</directory>
+                  <sources>
+                    <source>
+                      <location>${project.parent.relativePath}/conf</location>
+                      <excludes>
+                        <exclude>${project.parent.relativePath}/**/accumulo-site.xml</exclude>
+                        <exclude>${project.parent.relativePath}/**/accumulo-env.sh</exclude>
+                        <exclude>${project.parent.relativePath}/**/accumulo-metrics.xml</exclude>
+                        <exclude>${project.parent.relativePath}/**/test-*</exclude>
+                        <exclude>${project.parent.relativePath}/**/slaves</exclude>
+                        <exclude>${project.parent.relativePath}/**/masters</exclude>
+                        <exclude>${project.parent.relativePath}/**/tracers</exclude>
+                        <exclude>${project.parent.relativePath}/**/gc</exclude>
+                        <exclude>${project.parent.relativePath}/**/monitor</exclude>
+                      </excludes>
+                    </source>
+                  </sources>
+                </mapping>
+                <mapping>
+                  <directory>/opt/accumulo/accumulo-${project.version}/lib</directory>
+                  <dependency />
+                  <sources>
+                    <source>
+                      <location>${project.parent.relativePath}/lib</location>
+                    </source>
+                  </sources>
+                </mapping>
+              </mappings>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
 </project>
\ No newline at end of file

Modified: incubator/accumulo/trunk/src/server/pom.xml
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/server/pom.xml?rev=1208809&r1=1208808&r2=1208809&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/server/pom.xml (original)
+++ incubator/accumulo/trunk/src/server/pom.xml Wed Nov 30 21:39:11 2011
@@ -102,4 +102,31 @@
     </dependency>
   </dependencies>
 
+  <profiles>
+    <profile>
+      <id>dist</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>exec-maven-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>generate-native-in-memory-map</id>
+                <phase>package</phase>
+                <goals>
+                  <goal>exec</goal>
+                </goals>
+                <configuration>
+                  <executable>make</executable>
+                  <workingDirectory>${basedir}/src/main/c++</workingDirectory>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+
 </project>



Mime
View raw message