Skip to content

Loading…

Remove gcc dependency #67

Merged
merged 1 commit into from

2 participants

@qingbiao
Open Source Projects member

Stop compiling bbwp.exe (Windows) and bbwp (Mac), bundle it in the packager instead, so users do not have to install "gcc" in order to produce a patch.

@dmateescu

Tested, it works for me.

@dmateescu dmateescu merged commit 6e3258b into blackberry:master
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Nov 9, 2011
  1. @qingbiao
View
28 README.md
@@ -68,34 +68,6 @@ If you do not wish to use MacPorts simply use the following instructions.
6. Make sure that JAVA_HOME is set to the location of your JDK, e.g. export JAVA_HOME=/usr/java/jdk1.5.0_02 and that $JAVA_HOME/bin is in your PATH environment variable.
7. Run mvn --version to verify that it is correctly installed.
-### Download and install gcc compiler on Windows®
-1. The first step is to download the automated installer for MinGW from
-[here.](http://sourceforge.net/projects/mingw/files/).
-2. After the installer has been downloaded run the installer. Follow the
-installation instructions in the installer and make sure you note the
-installation directory for MingGW which is C:\MinGW by default.
-3. When you have installed MinGW on your machine navigate to the
-environment variable settings as stated above when installing Maven on Windows.
-4. Find the Path environment variable and click the "Edit" button.
-5. Append ";(Path to MinGW)\bin" to the value of the environment varible e.g.
-if MinGW is installed at C:\MinGW then you should append ";C:\MinGW\bin" to the
-Path environment variable.
-
-### Download and install gcc compiler on Mac OS X
-
-#### Register for an Apple Developer Connection Account
-1. Navigate to [http://connect.apple.com](http://connect.apple.com). You will
-be taken to a page with a prompt for your Apple ID. Click the "Join Now" link.
-2. On the next page scroll down to the bottom of the page and click on the
-"Learn More" link. On the following page click on the "Get Started" link and
-follow the instructions for the Apple Developer Registration process.
-
-#### Download and Install XCode
-Once you're registered. Navigate to
-[http://connect.apple.com](http://connect.apple.com) and download the
-XCode Tools (Version) disk image file. Double click the file and
-follow the installations steps to complete the installation.
-
### Build the project
From command line, change to the root directory of the WebWorks repository and run the following commands:
View
2 archiver/dist-mac.xml
@@ -13,6 +13,8 @@ xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assemb
<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>
View
2 archiver/dist-win.xml
@@ -13,6 +13,8 @@ xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assemb
<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>
</excludes>
View
44 archiver/pom.xml
@@ -78,6 +78,8 @@
<resource>
<directory>${tumbler.work.dir}\packager\res</directory>
<includes>
+ <include>bbwp</include>
+ <include>bbwp.exe</include>
<include>bbwp.properties</include>
<include>tld.txt</include>
</includes>
@@ -99,6 +101,7 @@
<resource>
<directory>${tumbler.bin.dir}</directory>
<includes>
+ <include>bbwp</include>
<include>bbwp.exe</include>
</includes>
</resource>
@@ -118,6 +121,8 @@
<resource>
<directory>${tumbler.bin.dir}</directory>
<includes>
+ <include>bbwp</include>
+ <include>bbwp.exe</include>
<include>bbwp.jar</include>
<include>tld.txt</include>
<include>bbwp.properties</include>
@@ -179,25 +184,6 @@
</configuration>
</execution>
<execution>
- <id>copy-resources-bbwp</id>
- <phase>compile</phase>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <configuration>
- <overwrite>true</overwrite>
- <outputDirectory>${installer.data.dir}</outputDirectory>
- <resources>
- <resource>
- <directory>${tumbler.work.dir}\packager\src\TumblerLauncher</directory>
- <includes>
- <include>bbwp</include>
- </includes>
- </resource>
- </resources>
- </configuration>
- </execution>
- <execution>
<id>copy-resources-classes</id>
<phase>process-classes</phase>
<goals>
@@ -282,26 +268,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>exec-maven-plugin</artifactId>
- <version>1.2.1</version>
- <executions>
- <execution>
- <phase>process-classes</phase>
- <goals>
- <goal>exec</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <executable>TumblerLauncher.bat</executable>
- <arguments>
- <argument>${tumbler.packager.src.dir}</argument>
- <argument>${tumbler.bin.dir}</argument>
- </arguments>
- </configuration>
- </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
View
0 packager/src/TumblerLauncher/bbwp → packager/res/bbwp
File renamed without changes.
View
BIN packager/res/bbwp.exe
Binary file not shown.
Something went wrong with that request. Please try again.