Browse files

General clean-up

Have a license file but make it empty in the created project.
Get rid of all-pom.xml
Clean commented out cruft out of pom.xml
  • Loading branch information...
1 parent 72a9699 commit 98076abf2d462e125658b294cc8c690eb00358a3 David Varvel and Phil Goodwin committed Feb 28, 2013
Showing with 21 additions and 113 deletions.
  1. +15 −0 LICENSE.txt
  2. +0 −74 all-pom.xml
  3. +0 −39 pom.xml
  4. +6 −0 script/helpers.rb
View
15 LICENSE.txt
@@ -0,0 +1,15 @@
+Copyright (c) 2013, Pivotal Labs
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
+documentation files (the "Software"), to deal in the Software without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit
+persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the
+Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
View
74 all-pom.xml
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>com.pivotallabs</groupId>
- <artifactId>androidintellijstarter-all</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- <packaging>pom</packaging>
- <name>AndroidIntelliJStarter-ALL</name>
- <description>Some extremely important project.</description>
-
- <properties>
- <robolectric.version>2.0-alpha-3-SNAPSHOT</robolectric.version>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>com.pivotallabs</groupId>
- <artifactId>androidintellijstarter</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.robolectric</groupId>
- <artifactId>robolectric</artifactId>
- <version>${robolectric.version}</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <modules>
- <module>submodules/robolectric</module>
- <module>.</module>
- </modules>
-
- <build>
- <finalName>${project.artifactId}</finalName>
-
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.3.2</version>
- <configuration>
- <source>1.6</source>
- <target>1.6</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>com.jayway.maven.plugins.android.generation2</groupId>
- <artifactId>android-maven-plugin</artifactId>
- <version>3.5.0</version>
- <configuration>
- <sdk>
- <!-- platform or api level (api level 4 = platform 1.6)-->
- <platform>16</platform>
- </sdk>
- <undeployBeforeDeploy>true</undeployBeforeDeploy>
- </configuration>
- <extensions>true</extensions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.6</version>
- <configuration>
- <excludes>
- <exclude>**/Test*.java</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
View
39 pom.xml
@@ -167,10 +167,6 @@
</dependency>
</dependencies>
- <!--<modules>-->
- <!--<module>submodules/robolectric</module>-->
- <!--</modules>-->
-
<build>
<finalName>${project.artifactId}</finalName>
@@ -208,39 +204,4 @@
</plugin>
</plugins>
</build>
-
- <!--<scm>-->
- <!--<url>git@github.com:pivotal/RobolectricSample.git</url>-->
- <!--<connection>scm:git:git://github.com/pivotal/RobolectricSample.git</connection>-->
- <!--<developerConnection>scm:git:git@github.com:pivotal/RobolectricSample.git</developerConnection>-->
- <!--</scm>-->
-
- <!--<licenses>-->
- <!--<license>-->
- <!--<name>MIT license</name>-->
- <!--<comments>-->
- <!--The MIT License-->
-
- <!--Copyright (c) 2013 Pivotal Labs-->
-
- <!--Permission is hereby granted, free of charge, to any person obtaining a copy-->
- <!--of this software and associated documentation files (the "Software"), to deal-->
- <!--in the Software without restriction, including without limitation the rights-->
- <!--to use, copy, modify, merge, publish, distribute, sublicense, and/or sell-->
- <!--copies of the Software, and to permit persons to whom the Software is-->
- <!--furnished to do so, subject to the following conditions:-->
-
- <!--The above copyright notice and this permission notice shall be included in-->
- <!--all copies or substantial portions of the Software.-->
-
- <!--THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR-->
- <!--IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,-->
- <!--FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE-->
- <!--AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER-->
- <!--LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,-->
- <!--OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN-->
- <!--THE SOFTWARE.-->
- <!--</comments>-->
- <!--</license>-->
- <!--</licenses>-->
</project>
View
6 script/helpers.rb
@@ -34,6 +34,8 @@ def project_setup(name, project_directory)
init_robolectric_as_a_project_submodule(project_directory)
+ clear_out_license_file(project_directory)
+
puts "#{project_directory} has been prepared and is ready to go. Enjoy!"
end
@@ -149,6 +151,10 @@ def create_local_properties_file(directory)
File.open(directory + "/local.properties", 'w') {|f| f.write("sdk.dir=" + ANDROID_HOME) }
end
+def clear_out_license_file(project_directory)
+ File.open(File.join(project_directory, 'LICENSE.txt'), 'w') {|file| file.truncate(0) }
+end
+
def system!(command)
system(command) || raise("There was an error while executing: #{command}")
end

0 comments on commit 98076ab

Please sign in to comment.