Permalink
Browse files

Completed conversion to sbt-izpack for installer generation.

  • Loading branch information...
1 parent a1b98f4 commit b5737dc1d370c6d3e30444cf133ed0cde392aefc @bmc committed Aug 28, 2011
Showing with 39 additions and 32 deletions.
  1. +0 −19 FAQ
  2. +21 −0 FAQ.md
  3. +3 −6 build.sbt
  4. +15 −7 src/main/izpack/install.yml
View
19 FAQ
@@ -1,19 +0,0 @@
-1. How do I get GNU Readline to work?
-
- Mac OS X:
-
- Follow the instructions at the following web page:
- http://blog.toonetown.com/2006/07/java-readline-on-mac-os-x-update.html
-
- This approach actually uses the Editline library, not GNU Readline.
- To customize the bindings, see editrc(5)
-
- Ubuntu:
- - Install the libreadline-java package
- - Ensure that /usr/share/java/libreadline-java.jar is in your
- CLASSPATH
- - Ensure that LD_LIBRARY_PATH contains /usr/lib/jni
- - If you want to use Editline, instead of Readline, ensure that
- libedit2 is installed. Then, use the sqlshell "-r editline"
- argument to override SQLShell's default readline library
- search.
View
21 FAQ.md
@@ -0,0 +1,21 @@
+title: SQLShell FAQ
+%%%
+
+1. How do I get GNU Readline to work?
+
+ Mac OS X:
+
+> Follow the instructions at the following web page:
+> http://blog.toonetown.com/2006/07/java-readline-on-mac-os-x-update.html
+>
+> This approach actually uses the Editline library, not GNU Readline.
+> To customize the bindings, see *editrc*(5)
+
+ Ubuntu:
+
+> - Install the libreadline-java package
+> - Ensure that /usr/share/java/libreadline-java.jar is in your CLASSPATH
+> - Ensure that `LD_LIBRARY_PATH` contains `/usr/lib/jni`
+> - If you want to use Editline, instead of Readline, ensure that `libedit2`
+> is installed. Then, use the *sqlshell* "-r editline" argument to
+> override SQLShell's default readline library search.
View
@@ -1,7 +1,7 @@
// ---------------------------------------------------------------------------
// Basic settings
-name := "sqlshell"
+name := "SQLShell"
version := "0.8"
@@ -57,10 +57,6 @@ variables in IzPack <+= baseDirectory {bd =>
}
variables in IzPack <+= (baseDirectory, scalaVersion, version) { (bd, sv, v) =>
- ("jarDir", (bd / "target" / ("scala_" + sv)).toString)
-}
-
-variables in IzPack <+= (baseDirectory, scalaVersion, version) { (bd, sv, v) =>
("sqlshellJar", (bd / "target" / ("scala_" + sv) /
("sqlshell_%s-%s.jar" format (sv, v))).toString)
}
@@ -75,7 +71,8 @@ sourceFiles in LWM <++= baseDirectory { d =>
}
sourceFiles in LWM <++= baseDirectory { d => (d / "README.md").get ++
- (d / "LICENSE.md").get }
+ (d / "LICENSE.md").get ++
+ (d / "FAQ.md").get }
targetDirectory in LWM <<= baseDirectory(_ / "target" / "docs")
@@ -1,4 +1,4 @@
-# sbt-izpack installer configuration.
+# SQLShell sbt-izpack installer configuration.
# ---------------------------------------------------------------------------
languages:
@@ -36,10 +36,6 @@ guiprefs:
name: looks
os: unix
-#installerRequirement:
-# condition: installonwindows
-# message: Installer can only be run on Windows
-
resources:
resource:
id: HTMLLicencePanel.licence
@@ -54,7 +50,7 @@ resources:
src: $installSourceDir/sqlshell-logo.png
resource:
id: XInfoPanel.info
- src: $installSourceDir/final-screen.txt
+ src: $installSourceDir/final_screen.txt
parse: yes
parseType: xml
installDirectory:
@@ -118,9 +114,21 @@ packs:
src: $installSourceDir/sample.cfg
targetFile: $INSTALL_PATH/sample.cfg
singleFile:
- src: $sqlshellJar
+ src: $appJar
targetFile: $INSTALL_PATH/lib/sqlshell.jar
fileset:
includes: ${libraryDependencies}
regexExcludes: posterous, sbt-lwm, izpack
targetDir: $INSTALL_PATH/lib
+ pack:
+ name: Documentation
+ required: false
+ preselected: false
+ description: "The $toolName User's Guide and other documents"
+ fileset:
+ includes: $targetDocDir/**/*.html
+ includes: $targetDocDir/**/*.js
+ includes: $targetDocDir/**/*.md
+ includes: $targetDocDir/**/*.css
+ includes: $targetDocDir/**/FAQ.html
+ targetDir: $INSTALL_PATH/docs

0 comments on commit b5737dc

Please sign in to comment.