Merge pull request #100 from cnauroth/master

#99: Windows build.properties contains shell script error instead of com...
twitter · Oct 31, 2014 · ce300c9 · ce300c9
2 parents 3294e77 + 4d28430
commit ce300c9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -4,3 +4,4 @@
 *         text=auto
 *.sln     text merge=union eol=crlf
 *.vcxproj text merge=union eol=crlf
+*.sh     text eol=lf
diff --git a/pom.xml b/pom.xml
@@ -221,7 +221,7 @@
                   <format property="build_time" pattern="MM/dd/yyyy hh:mm aa" timezone="GMT"/>
                 </tstamp>
                 <exec executable="sh" outputproperty="build_revision">
-                  <arg value="${basedir}/scripts/get_build_revision.sh" />
+                  <arg value="scripts/get_build_revision.sh" />
                 </exec>
                 <exec executable="whoami" outputproperty="build_author"/>
                 <exec executable="uname" outputproperty="build_os">
@@ -250,7 +250,7 @@
                   <format property="build_time" pattern="MM/dd/yyyy hh:mm aa" timezone="GMT"/>
                 </tstamp>
                 <exec executable="sh" outputproperty="build_revision">
-                  <arg value="${basedir}/scripts/get_build_revision.sh" />
+                  <arg value="scripts/get_build_revision.sh" />
                 </exec>
                 <propertyfile file="${project.build.outputDirectory}/build.properties"
                     comment="This file is automatically generated - DO NOT EDIT">