diff --git a/.gitignore b/.gitignore index 3ddc5d1fd..a542e37a8 100644 --- a/.gitignore +++ b/.gitignore @@ -49,4 +49,5 @@ hs_err_pid*.log /libsrc/uploader/nbproject/private/ /libsrc/uploader/build/ /libsrc/uploader/dist/ -jpexs_website.properties \ No newline at end of file +/jpexs_website.properties +/tools.properties \ No newline at end of file diff --git a/build.xml b/build.xml index 35393e969..259fa27ab 100644 --- a/build.xml +++ b/build.xml @@ -22,7 +22,6 @@ - diff --git a/build_common.xml b/build_common.xml index cccd02fec..51c4f0fed 100644 --- a/build_common.xml +++ b/build_common.xml @@ -131,12 +131,12 @@ - + - + @@ -213,18 +213,40 @@ - - + + - - + + + + + + + + + + + + + + + + tools.properties NOT found. + Please create file named "tools.properties" and add two lines: + nsis.path = Path to Nullsoft Install System + launch4j.path = Path to launch4j + + + + +