Skip to content

Commit

Permalink
Additional fixes to build process.
Browse files Browse the repository at this point in the history
  • Loading branch information
SkaceKamen committed Sep 19, 2016
1 parent ea7ce77 commit ded0ea7
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 9 deletions.
5 changes: 3 additions & 2 deletions build-installer.iss
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,10 @@ AppPublisherURL=http://sqflint.zipek.cz
AppVersion=1.0
DefaultDirName={pf}\SQFLint
UninstallDisplayIcon={app}\sqflint.exe
OutputDir=dist\
OutputBaseFilename=sqflint-1.0-install
OutputDir=dist\packages
OutputBaseFilename=sqflint-install
ChangesEnvironment=yes
SetupIconFile=dist-src\sqflint.ico

[CustomMessages]
AppAddPath=Add application directory to your environmental path
Expand Down
1 change: 1 addition & 0 deletions build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@
<exec executable="launch4jc">
<arg file="build-exe.xml" />
</exec>
<zip destfile="${dist.dir}/packages/sqflint.zip" basedir="${dist.dir}" />
<exec executable="iscc">
<arg file="build-installer.iss" />
</exec>
Expand Down
1 change: 0 additions & 1 deletion nbproject/build-impl.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ is divided into following sections:
-->
<project xmlns:j2seproject1="http://www.netbeans.org/ns/j2se-project/1" xmlns:j2seproject3="http://www.netbeans.org/ns/j2se-project/3" xmlns:jaxrpc="http://www.netbeans.org/ns/j2se-project/jax-rpc" basedir=".." default="default" name="SQFLint-impl">
<import file="build-native.xml"/>
<fail message="Please build using Ant 1.8.0 or higher.">
<condition>
<not>
Expand Down
4 changes: 2 additions & 2 deletions nbproject/genfiles.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ build.xml.script.CRC32=1a3aad22
build.xml.stylesheet.CRC32=[email protected]
# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
nbproject/build-impl.xml.data.CRC32=7705b82b
nbproject/build-impl.xml.script.CRC32=fe3ab4f8
nbproject/build-impl.xml.data.CRC32=ea231942
nbproject/build-impl.xml.script.CRC32=0aa59a62
nbproject/build-impl.xml.stylesheet.CRC32=[email protected]
1 change: 0 additions & 1 deletion nbproject/project.properties
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,6 @@ manifest.custom.permissions=
manifest.file=manifest.mf
meta.inf.dir=${src.dir}/META-INF
mkdist.disabled=false
native.bundling.enabled=true
platform.active=default_platform
project.license=mit
run.classpath=\
Expand Down
4 changes: 1 addition & 3 deletions nbproject/project.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,7 @@
<project xmlns="http://www.netbeans.org/ns/project/1">
<type>org.netbeans.modules.java.j2seproject</type>
<configuration>
<buildExtensions xmlns="http://www.netbeans.org/ns/ant-build-extender/1">
<extension file="build-native.xml" id="j2sedeploy"/>
</buildExtensions>
<buildExtensions xmlns="http://www.netbeans.org/ns/ant-build-extender/1"/>
<data xmlns="http://www.netbeans.org/ns/j2se-project/3">
<name>SQFLint</name>
<source-roots>
Expand Down

0 comments on commit ded0ea7

Please sign in to comment.