Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Cleanups in packaging.

  • Loading branch information...
commit d60b0ec34792654e2980e5e2512d1b05f0878e49 1 parent 3dca44c
@dweiss dweiss authored
View
2  hppc-core/CHANGES.txt → CHANGES
@@ -16,6 +16,8 @@ HPPC-52: Dropped custom hash functions and comparators from associative containe
** New features
+HPPC-61: Cleaned up Maven structure: parent aggregator and submodules.
+
HPPC-57: Added a view of values to associative containers (values() method).
HPPC-49: Added support for XorShift random.
View
0  hppc-core/hppc.LICENSE → LICENSE
File renamed without changes
View
52 README
@@ -14,4 +14,56 @@ mvn clean
# Generate Eclipse project files (the setup is a bit complex, so use this!)
mvn compile eclipse:eclipse
+# All unit tests
+mvn clean test
+# Install packages in a local repository.
+mvn clean install
+
+# Create a distribution package
+mvn clean package -Prelease
+
+
+hppc-core only targets
+----------------------
+
+# Run tests with clover
+mvn -Pclover
+
+# Generate code quality reports
+mvn -Pclover site
+
+# Creates a release directory for rsyncing to labs.carrotsearch.com:
+# rsync -azv -e "ssh -p 2222" --chmod=u=rwX,g=rX,o=rX target/site-labs/ carrot2@hostgator.carrot2.org:./public_html/com.carrotsearch.labs/download/hppc/
+mvn -Psite-labs
+
+
+
+Deployment
+----------
+
+# Deploy a snapshot of artefacts to SonaType's snapshots repo
+mvn clean deploy
+
+
+Clover
+------
+
+A local license is required for Clover support. Edit your ~/.m2/settings.xml and
+add an active profile definiting these settings:
+
+...
+ <profiles>
+ <profile>
+ <id>clover-license</id>
+ <properties>
+ <clover.license.path>[...]\clover.license</clover.license.path>
+ <maven.clover.licenseLocation>[...]\clover.license</maven.clover.licenseLocation>
+ </properties>
+ </profile>
+ </profiles>
+
+ <activeProfiles>
+ <activeProfile>clover-license</activeProfile>
+ </activeProfiles>
+...
View
1  hppc-benchmarks/lib/install-deps
@@ -1 +0,0 @@
-mvn install:install-file -DgroupId=trove -DartifactId=trove -Dversion=3.0.0rc1 -Dfile=trove-3.0.0rc1.jar -Dpackaging=jar -DgeneratePom=true
View
55 hppc-core/README.txt
@@ -1,55 +0,0 @@
-
-HPPC, high performance primitive collections
---------------------------------------------
-
-See JavaDoc and http://labs.carrotsearch.com/hppc.html for more info
-
-
-Development
------------
-
-mvn -Peclipse Generate Eclipse files, including optional dependencies and source folders.
-mvn clean Clean the working copy.
-mvn install -DskipTests Quick compile, no tests.
-mvn site Generate reports: pmd, cpd, findbugs.
- Results in: target/site
-mvn -Pclover Code coverage reports [requires -Dclover.license or global setting]
- Results in: target/clover/
-
-Release
--------
-
-mvn clean deploy Snapshot deploy to sonatype [requires proper setup in settings.xml]
-
-mvn -Prelease clean deploy
- Push snapshot or release artefacts to SonaType.
-
-mvn -Psite-labs Creates a release directory for rsyncing to labs.carrotsearch.com
- Results in: target/site-labs
-
- rsync -azv -e "ssh -p 2222" --chmod=u=rwX,g=rX,o=rX \
- target/site-labs/ \
- carrot2@hostgator.carrot2.org:./public_html/com.carrotsearch.labs/download/hppc/
-
-
-Clover
-------
-
-A local license is required for Clover support. Edit your ~/.m2/settings.xml and
-add an active profile definiting these settings:
-
-...
- <profiles>
- <profile>
- <id>clover-license</id>
- <properties>
- <clover.license.path>[...]\clover.license</clover.license.path>
- <maven.clover.licenseLocation>[...]\clover.license</maven.clover.licenseLocation>
- </properties>
- </profile>
- </profiles>
-
- <activeProfiles>
- <activeProfile>clover-license</activeProfile>
- </activeProfiles>
-...
View
28 hppc-core/pom.xml
@@ -260,7 +260,7 @@
</configuration>
<executions>
<execution>
- <id>make-assembly</id>
+ <id>make-labs-assembly</id>
<phase>package</phase>
<goals>
<goal>single</goal>
@@ -277,14 +277,13 @@
<id>release</id>
<build>
- <defaultGoal>install</defaultGoal>
+ <defaultGoal>package</defaultGoal>
<plugins>
<!-- Attach and modify JavaDocs. -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.6.1</version>
<configuration>
<encoding>${project.build.sourceEncoding}</encoding>
<stylesheetfile>${basedir}/src/main/javadoc/stylesheet.css</stylesheetfile>
@@ -316,7 +315,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
- <version>2.1.2</version>
<executions>
<execution>
<id>attach-sources</id>
@@ -341,7 +339,7 @@
</configuration>
<executions>
<execution>
- <id>make-assembly</id>
+ <id>make-release-assembly</id>
<phase>package</phase>
<goals>
<goal>single</goal>
@@ -349,26 +347,6 @@
</execution>
</executions>
</plugin>
-
- <!-- GPG sign artefacts. -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-gpg-plugin</artifactId>
- <version>1.1</version>
- <configuration>
- <excludes>
- <exclude>**/*.gz</exclude>
- <exclude>**/*.zip</exclude>
- </excludes>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>sign</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
</profile>
View
7 hppc-core/src/main/assembly/bin.xml
@@ -12,12 +12,15 @@
<fileSets>
<fileSet>
- <directory></directory>
+ <directory>../</directory>
<outputDirectory />
<includes>
- <include>*.LICENSE</include>
+ <include>LICENSE</include>
+ <include>README</include>
+ <include>CHANGES</include>
</includes>
</fileSet>
+
<fileSet>
<directory>${project.build.directory}</directory>
<outputDirectory />
View
98 hppc-core/src/main/java/com/carrotsearch/hppc/package.html
@@ -181,102 +181,6 @@
implement a given interface. The interface hierarchy is loosely inspired by STL.</p>
<p>An overview of interfaces and their relationship to data structures implemented
- in HPPC is depicted graphically in {@link com.carrotsearch.hppc.ObjectContainer}. Functional method-outline
- is shown in the table below.</p>
-
- <!-- At some point, it'd be nice to convert it to a real table... -->
-<pre>
-Method name sets lists deque
----------------------------------------------------------
-
-[ObjectContainer]
-
-contains(KType) + + +
-isEmpty() + + +
-size() + + +
-clear() + + +
-KType [] toArray + + +
-iterable [KType] + + +
-
-forEach(Procedure) + + +
-forEach(Predicate) + + +
-apply(Function) + + +
-
-
-[ObjectCollection: ObjectContainer]
-
-retainAll(Predicate) + + +
-retainAll(LookupContainer) + + +
-removeAll(Predicate) + + +
-removeAll(LookupContainer) + + +
-removeAllOccurrences(KType) + + +
-
-
-[ObjectIndexedContainer: ObjectCollection, RandomAccess]
-
-removeFirstOccurrence(KType) + +
-removeLastOccurrence(KType) + +
-indexOf(KType) +
-lastIndexOf(KType) +
-add(KType) + +
-insert(index, KType) +
-get(index) +
-remove(index) +
-removeRange(...) +
-
-
-[ObjectDeque: ObjectCollection]
-
-removeFirstOccurrence(KType) + +
-removeLastOccurrence(KType) + +
-addFirst(KType) +
-addLast(KType) +
-removeFirst() +
-removeLast() +
-getFirst() +
-getLast() +
-descendingIterator() +
-descendingForEach(Procedure) +
-descendingForEach(Predicate) +
-
-
-[ObjectSet: ObjectCollection]
-
-add(KType) + +
-
-
-[ObjectLookupContainer: ObjectContainer], {guaranteed constant-time object lookup}
-
-contains(KType) +
-</pre>
-
-
- <p>And a similar overview of associative containers.</p>
-
-<pre>
-Method name map [?multimap]
----------------------------------------------------------
-
-[ObjectObjectAssociativeContainer]
-
-iterable [KType, VType] +
-containsKey +
-size +
-isEmpty +
-removeAll(ObjectContainer) +
-removeAll(predicate) +
-forEach(procedure) +
-clear +
-keySet +
-
-
-[ObjectObjectMap : ObjectObjectAssociativeContainer]
-
-put +
-get +
-putAll +
-remove +
-</pre>
-
+ in HPPC is depicted graphically in {@link com.carrotsearch.hppc.ObjectContainer}.</p>
</body>
</html>
View
38 pom.xml
@@ -182,6 +182,18 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.6.1</version>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <version>2.1.2</version>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-eclipse-plugin</artifactId>
<version>2.8</version>
<configuration>
@@ -202,6 +214,32 @@
<defaultGoal>eclipse:eclipse</defaultGoal>
</build>
</profile>
+
+ <profile>
+ <id>sign</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-gpg-plugin</artifactId>
+ <version>1.1</version>
+ <configuration>
+ <excludes>
+ <exclude>**/*.gz</exclude>
+ <exclude>**/*.zip</exclude>
+ </excludes>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>sign</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
</project>
Please sign in to comment.
Something went wrong with that request. Please try again.