Skip to content

Commit

Permalink
commit Danny's changes for ignoring eclipse repository and fixing uni…
Browse files Browse the repository at this point in the history
…nstaller
  • Loading branch information
Jeff Lai committed Aug 8, 2012
1 parent 321f8c8 commit 83ad844
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 9 deletions.
15 changes: 7 additions & 8 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<groupId>com.force</groupId>
<artifactId>dataloader</artifactId>
<packaging>jar</packaging>
<version>25.0.0</version>
<version>25.0.2</version>
<name>Data Loader</name>
<url>https://github.com/forcedotcom/dataloader</url>
<organization>
Expand All @@ -22,15 +22,15 @@
</properties>

<repositories>
<repository>
<!-- <repository>
<id>eclipse</id>
<name>Eclipse Repository</name>
<layout>default</layout>
<url>http://maven.eclipse.org/nexus/content/repositories/testing</url>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository>
</repository> -->
</repositories>

<pluginRepositories>
Expand Down Expand Up @@ -188,8 +188,8 @@
</resource>
</resources>

<filters>
<filter>src/test/resources/testfilter.properties</filter>
<filters>
<filter>src/test/filters/test.properties</filter>
</filters>
<testResources>
<testResource>
Expand All @@ -200,8 +200,7 @@

<plugins>

<!-- we might want to use the maven-shade-plugin in the future instead
of maven-assembly-plugin -->
<!-- we might want to use the maven-shade-plugin in the future instead of maven-assembly-plugin -->
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
Expand Down Expand Up @@ -251,7 +250,7 @@
<exclude>**/TestRecordsUtil.java</exclude>
<exclude>**/integration/**</exclude>
</excludes>
<!--<skip>true</skip> -->
<!--<skip>true</skip>-->
<systemPropertiesFile>src/test/resources/system.properties</systemPropertiesFile>
</configuration>
</plugin>
Expand Down
10 changes: 9 additions & 1 deletion setup.nsi
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,15 @@ SectionEnd

Section "Uninstall"
SectionIn RO
RMDir /r "$INSTDIR"
Delete "$INSTDIR\${PROJECT_FINAL_NAME}-uber.jar"
Delete "$INSTDIR\dataloader-25.0.0-uber.jar"
Delete "$INSTDIR\icon_SforceDL16x16.ico"
Delete "$INSTDIR\icon_SforceDL32x32.ico"
Delete "$INSTDIR\dataloader_uninstall.exe"
RMDir /r "$INSTDIR\licenses"
RMDir /r "$INSTDIR\samples"
RMDir /r "$INSTDIR\bin"
RMDir /r "$INSTDIR\Java"
RMDir /r "$SMPROGRAMS\${PROJECT_ORGANIZATION_NAME}\${PROJECT_NAME}"
Delete "$DESKTOP\${PROJECT_NAME}.lnk"
RMDir /r "$APPDATA\${PROJECT_ORGANIZATION_NAME}"
Expand Down

0 comments on commit 83ad844

Please sign in to comment.