Permalink
Browse files

Created Archiver to allow creating a zip instead of an installer.

1. Changed output of build to zip
2. Got rid of internal dependencies
3. Cleaned up framework pom
  • Loading branch information...
1 parent 14f37e6 commit b0a5c2bcb6087250918e816aa55adb6fa3eb1169 @ronalag ronalag committed with nukulb Aug 29, 2011
Showing with 237 additions and 49 deletions.
  1. +54 −0 archiver/archive-desc.xml
  2. +111 −0 archiver/pom.xml
  3. +47 −48 framework/pom.xml
  4. BIN framework/resources/bbwp
  5. BIN framework/resources/bbwp.exe
  6. +25 −1 pom.xml
View
@@ -0,0 +1,54 @@
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
+ <id>WebWorksForPlaybook</id>
+ <formats>
+ <format>zip</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+
+ <fileSets>
+ <fileSet>
+ <directory>resources</directory>
+ <outputDirectory>./</outputDirectory>
+ <includes>
+ <include>*</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>${basedir}/../js_api</directory>
+ <outputDirectory>ext</outputDirectory>
+ <includes>
+ <include>blackberry.*</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>${basedir}/../js_api/Common_AS/JSONLibrary/src/json</directory>
+ <outputDirectory>AirAppTemplates/src/json</outputDirectory>
+ <includes>
+ <include>*</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>${basedir}/../js_api/globalJS</directory>
+ <outputDirectory>AirAppTemplates/src/WebWorksApplicationSharedJsRepository0/sharedglobal</outputDirectory>
+ <includes>
+ <include>*</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>${basedir}/../framework/src</directory>
+ <outputDirectory>AirAppTemplates/src</outputDirectory>
+ <includes>
+ <include>*/**</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>resources/bin</directory>
+ <outputDirectory>bin</outputDirectory>
+ <includes>
+ <include>*</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+</assembly>
View
@@ -0,0 +1,111 @@
+<project>
+ <parent>
+ <groupId>net.rim.snarf</groupId>
+ <artifactId>snarf</artifactId>
+ <version>1.0.0.1</version>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>${project.parent.groupId}</groupId>
+ <artifactId>archiver</artifactId>
+ <version>${project.parent.version}-SNAPSHOT</version>
+ <name>${project.artifactId}-${project.version}</name>
+ <packaging>pom</packaging>
+
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <webworksZipPackage.filename>WebWorksForPlaybook.zip</webworksZipPackage.filename>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>${project.parent.groupId}</groupId>
+ <artifactId>framework</artifactId>
+ <version>${project.parent.version}-SNAPSHOT</version>
+ <type>zip</type>
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <sourceDirectory>${basedir}/..</sourceDirectory>
+ <finalName>WebWorksForPlaybook</finalName>
+
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <!-- Unzip the dependency -->
+ <execution>
+ <id>unpack-framework</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>framework</artifactId>
+ <version>${project.version}</version>
+ <type>zip</type>
+ <overWrite>true</overWrite>
+ <outputDirectory>${basedir}/resources</outputDirectory>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.2.1</version>
+ <executions>
+ <execution>
+ <id>generate-archive</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+ <descriptor>${basedir}/archive-desc.xml</descriptor>
+ </descriptors>
+ <appendAssemblyId>false</appendAssemblyId>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <!-- copy archive to output directory -->
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>2.5</version>
+ <executions>
+ <execution>
+ <id>copy-archive</id>
+
+ <phase>package</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${project.build.sourceDirectory}/target</outputDirectory>
+ <resources>
+ <resource>
+ <directory>${basedir}/target</directory>
+ <includes>
+ <include>*.zip</include>
+ </includes>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ </plugins>
+ </build>
+</project>
View
@@ -27,60 +27,60 @@
</dependencies>
<build>
- <!--<sourceDirectory>src</sourceDirectory>-->
<directory>target</directory>
<finalName>WebWorksForPlaybook</finalName>
<plugins>
- <plugin>
+ <plugin>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>2.5</version>
+ <executions>
+ <execution>
+ <id>copy-resources</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${basedir}/target/launcher</outputDirectory>
+ <resources>
+ <resource>
+ <directory>resources</directory>
+ <includes>
+ <include>bbwp*</include>
+ </includes>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
- <execution>
- <id>copy</id>
- <phase>prepare-package</phase>
- <goals>
- <goal>copy</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>net.rim.snarf</groupId>
- <artifactId>winexe</artifactId>
- <version>1.0.1</version>
- <type>exe</type>
- <overWrite>true</overWrite>
- <outputDirectory>${nativeLauncher.dir}</outputDirectory>
- <destFileName>bbwp.exe</destFileName>
- </artifactItem>
-
- <artifactItem>
- <groupId>net.rim.snarf</groupId>
- <artifactId>macexe</artifactId>
- <version>1.0.2</version>
- <type>exe</type>
- <overWrite>true</overWrite>
- <outputDirectory>${nativeLauncher.dir}</outputDirectory>
- <destFileName>bbwp</destFileName>
- </artifactItem>
-
- <artifactItem>
- <groupId>net.rim.snarf</groupId>
- <artifactId>packager</artifactId>
- <version>${project.parent.version}-SNAPSHOT</version>
- <type>jar</type>
- <overWrite>true</overWrite>
- <outputDirectory>${bbwpjar.dir}</outputDirectory>
- <destFileName>bbwp.jar</destFileName>
- </artifactItem>
-
- </artifactItems>
- <!-- other configurations here -->
- </configuration>
- </execution>
+ <execution>
+ <id>copy</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>net.rim.snarf</groupId>
+ <artifactId>packager</artifactId>
+ <version>${project.parent.version}-SNAPSHOT</version>
+ <type>jar</type>
+ <overWrite>true</overWrite>
+ <outputDirectory>${bbwpjar.dir}</outputDirectory>
+ <destFileName>bbwp.jar</destFileName>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
</executions>
- </plugin>
-
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
@@ -100,8 +100,7 @@
</configuration>
</execution>
</executions>
- </plugin>
-
+ </plugin>
</plugins>
</build>
</project>
View
Binary file not shown.
Binary file not shown.
View
26 pom.xml
@@ -9,12 +9,36 @@
<modules>
<module>packager</module>
<module>framework</module>
- <module>installer</module>
</modules>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
+
+ <profiles>
+ <profile>
+ <id>MakeInstaller</id>
+ <activation>
+ <file>
+ <exists>${basedir}/installer/pom.xml</exists>
+ </file>
+ </activation>
+ <modules>
+ <module>installer</module>
+ </modules>
+ </profile>
+ <profile>
+ <id>MakeZip</id>
+ <activation>
+ <file>
+ <missing>${basedir}/installer/pom.xml</missing>
+ </file>
+ </activation>
+ <modules>
+ <module>archiver</module>
+ </modules>
+ </profile>
+ </profiles>
<distributionManagement>
<repository>

0 comments on commit b0a5c2b

Please sign in to comment.