remove rhino license. add script to make sure data loader app file is…

…n't locked inside dmg
forcedotcom · Apr 25, 2013 · e4c7573 · e4c7573
1 parent d1195e5
commit e4c7573
Show file tree

Hide file tree

Showing 5 changed files with 74 additions and 501 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "yoursway-create-dmg"]
+	path = yoursway-create-dmg
+	url = git://github.com/andreyvit/yoursway-create-dmg.git
diff --git a/make-pretty-dmg.sh b/make-pretty-dmg.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+BASEDIR="$1"
+DMG_SRC_DIR="$2"
+DMG_OUT="$3"
+
+chflags nouchg $DMG_SRC_DIR/*
+chmod -R +w $DMG_SRC_DIR
+
+bash $BASEDIR/yoursway-create-dmg/create-dmg --icon-size 32 --window-size 400 300 --app-drop-link 300 150 --icon "Data Loader" 100 150 $DMG_OUT $DMG_SRC_DIR
diff --git a/pom.xml b/pom.xml
@@ -307,12 +307,15 @@
                     <exclude>**/*.md</exclude>
                     <exclude>**/*.nsi</exclude>
                     <exclude>**/*.properties</exclude>
+                    <exclude>**/*.sh</exclude>
                     <exclude>windows-dependencies/**</exclude>
                     <exclude>local-proj-repo/**</exclude>
                     <exclude>src/main/resources/**</exclude>
                     <exclude>src/main/nsis/**</exclude>
                     <exclude>src/test/resources/**</exclude>
+                    <exclude>yoursway-create-dmg/**</exclude>
                     <exclude>.gitignore</exclude>
+                    <exclude>.gitmodules</exclude>
                 </excludes>
             </configuration>
             <executions>
@@ -392,37 +395,6 @@
         </dependency>
       </dependencies>
     </profile>
-    <profile>
-        <id>MacOSbundle</id>
-        <activation>
-            <os>
-                <family>mac</family>
-            </os>
-        </activation>
-        <build>
-            <plugins>
-                <plugin>
-                    <groupId>org.codehaus.mojo</groupId>
-                    <artifactId>osxappbundle-maven-plugin</artifactId>
-                    <version>1.0-alpha-2</version>
-                    <configuration>
-                        <mainClass>com.salesforce.dataloader.process.DataLoaderRunner</mainClass>
-                        <jvmVersion>1.6</jvmVersion>
-                        <iconFile>${basedir}/src/main/resources/img/icons/icon_loader.icns</iconFile>
-                        <dictionaryFile>${basedir}/src/main/resources/Info.plist</dictionaryFile>
-                    </configuration>
-                    <executions>
-                        <execution>
-                            <phase>package</phase>
-                            <goals>
-                                <goal>bundle</goal>
-                            </goals>
-                        </execution>
-                    </executions>
-                </plugin>
-            </plugins>
-        </build>
-    </profile>
     <profile>
       <id>win32</id>
       <activation>
@@ -620,6 +592,63 @@
       </build>
     </profile>
 
+    <profile>
+        <id>mac-dmg</id>
+        <activation>
+            <os>
+                <family>mac</family>
+            </os>
+        </activation>
+        <build>
+            <plugins>
+                <plugin>
+                    <groupId>org.codehaus.mojo</groupId>
+                    <artifactId>osxappbundle-maven-plugin</artifactId>
+                    <version>1.0-alpha-2</version>
+                    <configuration>
+                        <mainClass>com.salesforce.dataloader.process.DataLoaderRunner</mainClass>
+                        <jvmVersion>1.6</jvmVersion>
+                        <iconFile>${basedir}/src/main/resources/img/icons/icon_loader.icns</iconFile>
+                        <dictionaryFile>${basedir}/src/main/resources/Info.plist</dictionaryFile>
+                    </configuration>
+                    <executions>
+                        <execution>
+                            <phase>package</phase>
+                            <goals>
+                                <goal>bundle</goal>
+                            </goals>
+                        </execution>
+                    </executions>
+                </plugin>
+        <plugin>
+          <groupId>org.codehaus.mojo</groupId>
+          <artifactId>exec-maven-plugin</artifactId>
+          <version>1.1</version>
+          <executions>
+            <execution>
+              <id>make-pretty-dmg</id>
+              <phase>package</phase>
+              <configuration>
+                <executable>bash</executable>
+                <arguments>
+                  <argument>make-pretty-dmg.sh</argument>
+                  <argument>${basedir}</argument>
+                  <argument>${project.build.directory}/${project.build.finalName}</argument>
+                  <argument>${project.build.directory}/${project.build.finalName}-pretty.dmg</argument>
+                </arguments>
+              </configuration>
+              <goals>
+                <goal>exec</goal>
+              </goals>
+            </execution>
+          </executions>
+        </plugin>
+
+            </plugins>
+        </build>
+    </profile>
+
+
   </profiles>