Merge branch 'master' into next

blackberry · Nov 14, 2011 · b49033a · b49033a
2 parents 0ef2bb1 + 914fada
commit b49033a
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 28 deletions.
diff --git a/README.md b/README.md
@@ -39,7 +39,7 @@ Note: In order to build the source code you must have the [Java SE Development K
 7. If JAVA_HOME is not listed as one of the variables under System Variables then add a new environment variable with "JAVA_HOME" as the name and the path to you JDK installation directory (not the bin folder) as the value.
 8. Click on the Path variable and click edit. Then add the following string to the end of value for path:
 
-        "%JAVA_HOME%\bin;%M2%"
+        %JAVA_HOME%\bin;%M2%
      
 9. Open up a command prompt and type "mvn --version". _NOTE: If you already had a command prompt open, close it and open a new one so that your changes are reflected._ You should see some information about your maven installation. If you get a prompt stating that the command was not found then you probably made a mistake in one of the previous steps.
 
@@ -72,9 +72,9 @@ If you do not wish to use MacPorts simply use the following instructions.
 
 From command line, change to the root directory of the WebWorks repository and run the following commands:
 
-        mvn clean install -DPRODUCT_VERSION=[version]
+        mvn clean install -DPRODUCT_VERSION=version
 
-The version is the WebWorks version that you want to build (e.g. 2.3.0.1).
+Where the version is the WebWorks version that you want to build (e.g. 2.3.0.1), which will be shown when you execute "bbwp" in the command line.
 The first time the build is run it will take up to 5 minutes to complete and will require an internet connection. Subsequent builds take around 2 minutes.
 
 If the build is successful two zip files will be generated in a "target" directory located in the root of the WebWorks repository.

diff --git a/archiver/dist-mac.xml b/archiver/dist-mac.xml
@@ -10,14 +10,16 @@ xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assemb
 
 <fileSets>
     <fileSet>
-            <directory>target\installdata</directory>
+            <fileMode>755</fileMode>
+            <directoryMode>755</directoryMode>
+            <directory>target/installdata</directory>
             <excludes>
             <exclude>bbwp.exe</exclude>
-            <exclude>\bin\bbwp</exclude>
-            <exclude>\bin\bbwp.exe</exclude>
-            <exclude>\bin\javaloader.exe</exclude>
-            <exclude>\bin\preverify.exe</exclude>
-            <exclude>\bin\rapc.exe</exclude>
+            <exclude>/bin/bbwp</exclude>
+            <exclude>/bin/bbwp.exe</exclude>
+            <exclude>/bin/javaloader.exe</exclude>
+            <exclude>/bin/preverify.exe</exclude>
+            <exclude>/bin/rapc.exe</exclude>
             </excludes>
             <outputDirectory>/</outputDirectory>
     </fileSet>

diff --git a/archiver/dist-win.xml b/archiver/dist-win.xml
@@ -10,15 +10,17 @@ xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assemb
 
 <fileSets>
     <fileSet>
-            <directory>target\installdata</directory>
+            <fileMode>755</fileMode>
+            <directoryMode>755</directoryMode>
+            <directory>target/installdata</directory>
             <excludes>
             <exclude>bbwp</exclude>
-            <exclude>\bin\bbwp</exclude>
-            <exclude>\bin\bbwp.exe</exclude>
-            <exclude>\bin\javaloader</exclude>
-            <exclude>\bin\preverify</exclude>
+            <exclude>/bin/bbwp</exclude>
+            <exclude>/bin/bbwp.exe</exclude>
+            <exclude>/bin/javaloader</exclude>
+            <exclude>/bin/preverify</exclude>
             </excludes>
-            <outputDirectory>\</outputDirectory>
+            <outputDirectory>/</outputDirectory>
     </fileSet>
 </fileSets>
 

diff --git a/archiver/dist.xml b/archiver/dist.xml
@@ -10,7 +10,7 @@ xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assemb
 
 <fileSets>
     <fileSet>
-            <directory>target\installdata</directory>
+            <directory>target/installdata</directory>
             <outputDirectory>/installdata</outputDirectory>
     </fileSet>
 </fileSets>

diff --git a/archiver/pom.xml b/archiver/pom.xml
@@ -26,7 +26,7 @@
       <tumbler.classes.dir>${tumbler.target.dir}/classes</tumbler.classes.dir>      
       <tumbler.file.dir>${tumbler.target.dir}/files</tumbler.file.dir>
       <manifest.file>${tumbler.target.dir}/manifest</manifest.file>
-      <installer.data.dir>${tumbler.target.dir}\installdata</installer.data.dir>
+      <installer.data.dir>${tumbler.target.dir}/installdata</installer.data.dir>
    </properties>
 
    <dependencies>
@@ -76,7 +76,7 @@
                       <outputDirectory>${tumbler.bin.dir}</outputDirectory>
                       <resources>
                         <resource>
-                          <directory>${tumbler.work.dir}\packager\res</directory>
+                          <directory>${tumbler.work.dir}/packager/res</directory>
                           <includes>
                             <include>bbwp</include>
                             <include>bbwp.exe</include>
@@ -116,7 +116,7 @@
                     </goals>
                     <configuration>
                       <overwrite>true</overwrite>
-                      <outputDirectory>${installer.data.dir}\bin</outputDirectory>
+                      <outputDirectory>${installer.data.dir}/bin</outputDirectory>
                       <resources>
                         <resource>
                           <directory>${tumbler.bin.dir}</directory>
@@ -139,10 +139,10 @@
                     </goals>
                     <configuration>
                       <overwrite>true</overwrite>
-                      <outputDirectory>${installer.data.dir}\device_templates</outputDirectory>
+                      <outputDirectory>${installer.data.dir}/device_templates</outputDirectory>
                       <resources>
                         <resource>
-                          <directory>${tumbler.work.dir}\framework\src</directory>
+                          <directory>${tumbler.work.dir}/framework/src</directory>
                           <includes>
                             <include>blackberry/</include>
                             <include>js/</include>
@@ -159,10 +159,10 @@
                     </goals>
                     <configuration>
                       <overwrite>true</overwrite>
-                      <outputDirectory>${installer.data.dir}\ext</outputDirectory>
+                      <outputDirectory>${installer.data.dir}/ext</outputDirectory>
                       <resources>
                         <resource>
-                          <directory>${tumbler.work.dir}\api\output</directory>
+                          <directory>${tumbler.work.dir}/api/output</directory>
                         </resource>
                       </resources>
                     </configuration>
@@ -175,10 +175,10 @@
                     </goals>
                     <configuration>
                       <overwrite>true</overwrite>
-                      <outputDirectory>${installer.data.dir}\ext\common\blackberry</outputDirectory>
+                      <outputDirectory>${installer.data.dir}/ext/common/blackberry</outputDirectory>
                       <resources>
                         <resource>
-                          <directory>${tumbler.work.dir}\api\CommonAPI\src\blackberry</directory>
+                          <directory>${tumbler.work.dir}/api/CommonAPI/src/blackberry</directory>
                         </resource>
                       </resources>
                     </configuration>
@@ -196,7 +196,7 @@
                         <resource>
                           <directory>${tumbler.packager.src.dir}</directory>
                           <includes>
-                            <include>**\*.properties</include>
+                            <include>**/*.properties</include>
                           </includes>
                         </resource>
                       </resources>
@@ -216,7 +216,7 @@
                        <goal>replace</goal>
                    </goals>     
             <configuration>
-               <file>target\manifest\Main_Class.txt</file>
+               <file>target/manifest/Main_Class.txt</file>
                <replacements>
                    <replacement>
                        <token>@version@</token>
@@ -258,7 +258,7 @@
             <finalName>bbwp</finalName>
             <outputDirectory>${tumbler.bin.dir}</outputDirectory>
             <archive>
-              <manifestFile>${manifest.file}\Main_Class.txt</manifestFile>
+              <manifestFile>${manifest.file}/Main_Class.txt</manifestFile>
             </archive>
           </configuration>
                    <phase>process-classes</phase>