Skip to content

Commit

Permalink
* Remove platform property from pom.xml, replaced with the `plat…
Browse files Browse the repository at this point in the history 
…form.dependency` one in JavaCPP Presets (issue #10)
  • Loading branch information
@saudet
saudet committed Jun 15, 2014
1 parent 0e7cd79 commit 27c06fd
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 152 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

* Make all dependencies from the JavaCPP Presets optional to let users select what they need ([issue #10](https://github.com/bytedeco/javacv/issues/10))
* Remove `platform` property from `pom.xml`, replaced with the `platform.dependency` one in JavaCPP Presets ([issue #10](https://github.com/bytedeco/javacv/issues/10))
* Add new `RLSA` sample, thanks to Nicholas Woodward ([issue #469](http://code.google.com/p/javacv/issues/detail?id=469))
* Fix a timestamp rounding issue in `FFmpegFrameGrabber` that causes `setFrameNumber()` to sometimes pick the wrong frame if FPS is not a proper divisor of 1000000 ([issue #5](https://github.com/bytedeco/javacv/issues/5))
* Increase the flexibility of the `pom.xml` file by making it possible to specify a custom version of JavaCPP
Expand Down
151 changes: 0 additions & 151 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.build.timestamp.format>yyyyMMddhhmm</maven.build.timestamp.format>
<javacpp.version>${project.version}</javacpp.version>
<platform>${os.name}-${os.arch}</platform> <!-- For Android: -Dplatform=android-arm -->
<!-- Reinclude the following with profiles, either all: -Pall
or selectively: -Pmarkers,ffmpeg,dc1394,flycapture,openkinect,ps3eye,videoinput,jogamp -->
<exclude.markers>**/Mark*.java</exclude.markers>
Expand All @@ -75,93 +74,36 @@
<groupId>org.bytedeco.javacpp-presets</groupId>
<artifactId>opencv</artifactId>
<version>2.4.9-${javacpp.version}</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.bytedeco.javacpp-presets</groupId>
<artifactId>ffmpeg</artifactId>
<version>2.2.1-${javacpp.version}</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.bytedeco.javacpp-presets</groupId>
<artifactId>flycapture</artifactId>
<version>1.7.17-${javacpp.version}</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.bytedeco.javacpp-presets</groupId>
<artifactId>libdc1394</artifactId>
<version>2.2.2-${javacpp.version}</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.bytedeco.javacpp-presets</groupId>
<artifactId>libfreenect</artifactId>
<version>0.4-${javacpp.version}</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.bytedeco.javacpp-presets</groupId>
<artifactId>videoinput</artifactId>
<version>0.200-${javacpp.version}</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.bytedeco.javacpp-presets</groupId>
<artifactId>artoolkitplus</artifactId>
<version>2.3.0-${javacpp.version}</version>
<optional>true</optional>
</dependency>

<dependency>
<groupId>org.bytedeco.javacpp-presets</groupId>
<artifactId>opencv</artifactId>
<version>2.4.9-${javacpp.version}</version>
<classifier>${platform}</classifier>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.bytedeco.javacpp-presets</groupId>
<artifactId>ffmpeg</artifactId>
<version>2.2.1-${javacpp.version}</version>
<classifier>${platform}</classifier>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.bytedeco.javacpp-presets</groupId>
<artifactId>flycapture</artifactId>
<version>1.7.17-${javacpp.version}</version>
<classifier>${platform}</classifier>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.bytedeco.javacpp-presets</groupId>
<artifactId>libdc1394</artifactId>
<version>2.2.2-${javacpp.version}</version>
<classifier>${platform}</classifier>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.bytedeco.javacpp-presets</groupId>
<artifactId>libfreenect</artifactId>
<version>0.4-${javacpp.version}</version>
<classifier>${platform}</classifier>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.bytedeco.javacpp-presets</groupId>
<artifactId>videoinput</artifactId>
<version>0.200-${javacpp.version}</version>
<classifier>${platform}</classifier>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.bytedeco.javacpp-presets</groupId>
<artifactId>artoolkitplus</artifactId>
<version>2.3.0-${javacpp.version}</version>
<classifier>${platform}</classifier>
<optional>true</optional>
</dependency>

<dependency>
Expand Down Expand Up @@ -362,20 +304,14 @@
</build>
</profile>

<!-- If someone knows a better way to do this, please do let me know! -->
<profile>
<id>all</id>
<properties>
<exclude.artoolkitplus>none</exclude.artoolkitplus>
<exclude.markers>none</exclude.markers>
<exclude.calibration>none</exclude.calibration>
<exclude.libav>none</exclude.libav>
<exclude.libsw>none</exclude.libsw>
<exclude.postproc>none</exclude.postproc>
<exclude.ffmpeg>none</exclude.ffmpeg>
<exclude.dc1394>none</exclude.dc1394>
<exclude.flycapture>none</exclude.flycapture>
<exclude.freenect>none</exclude.freenect>
<exclude.openkinect>none</exclude.openkinect>
<exclude.ps3eye>none</exclude.ps3eye>
<exclude.videoinput>none</exclude.videoinput>
Expand All @@ -386,17 +322,13 @@
<profile>
<id>markers</id>
<properties>
<exclude.artoolkitplus>none</exclude.artoolkitplus>
<exclude.markers>none</exclude.markers>
<exclude.calibration>none</exclude.calibration>
</properties>
</profile>
<profile>
<id>ffmpeg</id>
<properties>
<exclude.libav>none</exclude.libav>
<exclude.libsw>none</exclude.libsw>
<exclude.postproc>none</exclude.postproc>
<exclude.ffmpeg>none</exclude.ffmpeg>
</properties>
</profile>
Expand All @@ -415,7 +347,6 @@
<profile>
<id>openkinect</id>
<properties>
<exclude.freenect>none</exclude.freenect>
<exclude.openkinect>none</exclude.openkinect>
</properties>
</profile>
Expand All @@ -438,88 +369,6 @@
<exclude.opencl>none</exclude.opencl>
</properties>
</profile>

<profile>
<id>linux</id>
<activation>
<os><name>linux</name></os>
</activation>
<properties>
<os.name>linux</os.name>
</properties>
</profile>
<profile>
<id>macosx</id>
<activation>
<os><name>mac os x</name></os>
</activation>
<properties>
<os.name>macosx</os.name>
</properties>
</profile>
<profile>
<id>windows</id>
<activation>
<os><family>windows</family></os>
</activation>
<properties>
<os.name>windows</os.name>
</properties>
</profile>
<profile>
<id>i386</id>
<activation>
<os><arch>i386</arch></os>
</activation>
<properties>
<os.arch>x86</os.arch>
</properties>
</profile>
<profile>
<id>i486</id>
<activation>
<os><arch>i486</arch></os>
</activation>
<properties>
<os.arch>x86</os.arch>
</properties>
</profile>
<profile>
<id>i586</id>
<activation>
<os><arch>i586</arch></os>
</activation>
<properties>
<os.arch>x86</os.arch>
</properties>
</profile>
<profile>
<id>i686</id>
<activation>
<os><arch>i686</arch></os>
</activation>
<properties>
<os.arch>x86</os.arch>
</properties>
</profile>
<profile>
<id>amd64</id>
<activation>
<os><arch>amd64</arch></os>
</activation>
<properties>
<os.arch>x86_64</os.arch>
</properties>
</profile>
<profile>
<id>x86-64</id>
<activation>
<os><arch>x86-64</arch></os>
</activation>
<properties>
<os.arch>x86_64</os.arch>
</properties>
</profile>
</profiles>

</project>

0 comments on commit 27c06fd

Please sign in to comment.