activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tab...@apache.org
Subject svn commit: r1004689 - in /activemq/activemq-cpp/trunk/activemq-c: Makefile.am pom.xml
Date Tue, 05 Oct 2010 15:55:58 GMT
Author: tabish
Date: Tue Oct  5 15:55:58 2010
New Revision: 1004689

URL: http://svn.apache.org/viewvc?rev=1004689&view=rev
Log:
Setup initial build rules and version defines.

Modified:
    activemq/activemq-cpp/trunk/activemq-c/Makefile.am
    activemq/activemq-cpp/trunk/activemq-c/pom.xml

Modified: activemq/activemq-cpp/trunk/activemq-c/Makefile.am
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-c/Makefile.am?rev=1004689&r1=1004688&r2=1004689&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-c/Makefile.am (original)
+++ activemq/activemq-cpp/trunk/activemq-c/Makefile.am Tue Oct  5 15:55:58 2010
@@ -18,9 +18,9 @@
 # Since we don't strictly follow the GNU standard of having 'NEWS README AUTHORS ChangeLog'
files
 AUTOMAKE_OPTIONS = foreign
 
-SUBDIRS = src/main/c src/examples/c
+SUBDIRS = src/main/c
 if BUILD_CPPUNIT_TESTS
-  SUBDIRS += src/test/c src/test-integration/c src/test-benchmarks/c
+  SUBDIRS += src/test/c
 endif
 
 #Distribute these directories:

Modified: activemq/activemq-cpp/trunk/activemq-c/pom.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-c/pom.xml?rev=1004689&r1=1004688&r2=1004689&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-c/pom.xml (original)
+++ activemq/activemq-cpp/trunk/activemq-c/pom.xml Tue Oct  5 15:55:58 2010
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.activemq-cpp</groupId>
     <artifactId>activemq-cpp-pom</artifactId>
-    <version>3.1.0-SNAPSHOT</version>
+    <version>3.3.x-SNAPSHOT</version>
   </parent>
 
   <artifactId>activemq-c-library</artifactId>
@@ -41,29 +41,6 @@
         <inherited>false</inherited>
         <executions>
           <execution>
-            <id>Integration-Test-Makefile</id>
-            <configuration>
-              <outputDirectory>${basedir}/src/test-integration/c/</outputDirectory>
-              <template>${basedir}/src/test-integration/c/Makefile.maven</template>
-              <sources>
-                <directory>${basedir}/src/test-integration/c</directory>
-                <includes>
-                  <includes>**\*.cpp</includes>
-                </includes>
-              </sources>
-              <headers>
-                <directory>${basedir}/src/test-integration/c</directory>
-                <includes>
-                  <includes>**\*.h</includes>
-                </includes>
-              </headers>
-            </configuration>
-            <phase>generate-resources</phase>
-            <goals>
-              <goal>makefile</goal>
-            </goals>
-          </execution>
-          <execution>
             <id>Test-Makefile</id>
             <configuration>
               <outputDirectory>${basedir}/src/test/c</outputDirectory>
@@ -71,6 +48,7 @@
               <sources>
                 <directory>${basedir}/src/test/c</directory>
                 <includes>
+                  <includes>**\*.c</includes>
                   <includes>**\*.cpp</includes>
                 </includes>
               </sources>



Mime
View raw message