diff --git a/debian/changelog b/debian/changelog index 2ef9e9b..40268ae 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ * Team upload. * New upstream release + - Build the new jawn-util module * No longer build with the embedded SBT using Scala 2.10 (Closes: #893456) * Standards-Version updated to 4.2.1 * Switch to debhelper level 11 diff --git a/debian/clean b/debian/clean index d3198fe..46d7228 100644 --- a/debian/clean +++ b/debian/clean @@ -1,5 +1,6 @@ ast/target/ parser/target/ +util/target/ support/argonaut/target/ support/json4s/target/ support/play/target/ diff --git a/debian/libjawn-java.poms b/debian/libjawn-java.poms index 91d0cf9..9f7da0b 100644 --- a/debian/libjawn-java.poms +++ b/debian/libjawn-java.poms @@ -1,5 +1,6 @@ debian/poms/jawn-ast.pom --java-lib --usj-name=jawn-ast --artifact=ast/target/jawn-ast.jar debian/poms/jawn-parser.pom --java-lib --usj-name=jawn-parser --artifact=parser/target/jawn-parser.jar +debian/poms/jawn-util.pom --java-lib --usj-name=jawn-util --artifact=util/target/jawn-util.jar #debian/poms/jawn-argonaut.pom --java-lib --usj-name=jawn-argonaut --artifact=support/argonaut/target/jawn-argonaut.jar debian/poms/jawn-json4s.pom --java-lib --usj-name=jawn-json4s --artifact=support/json4s/target/jawn-json4s.jar diff --git a/debian/poms/jawn-util.pom b/debian/poms/jawn-util.pom new file mode 100644 index 0000000..f059d31 --- /dev/null +++ b/debian/poms/jawn-util.pom @@ -0,0 +1,58 @@ + + + 4.0.0 + org.spire-math + jawn-util_2.11 + jar + util + http://github.com/non/jawn + 0.11.1 + + + MIT + http://opensource.org/licenses/MIT + repo + + + util + + org.spire-math + http://github.com/non/jawn + + + https://github.com/non/jawn + scm:git:git@github.com:non/jawn.git + + + + d_m + Erik Osheim + erik@plastic-idolatry.com + http://github.com/non/ + + + + + org.scala-lang + scala-library + 2.11.11 + + + org.spire-math + jawn-parser_2.11 + 0.11.1 + + + org.scalatest + scalatest_2.11 + 3.0.3 + test + + + org.scalacheck + scalacheck_2.11 + 1.13.5 + test + + + \ No newline at end of file diff --git a/debian/rules b/debian/rules index dbc2418..d037bc9 100755 --- a/debian/rules +++ b/debian/rules @@ -17,42 +17,47 @@ cp -R parser/src/main/resources/* parser/target/classes jar cf parser/target/jawn-parser.jar -C parser/target/classes . + # util + mkdir -p util/target/classes + scalac -d util/target/classes $(shell find util/src/main/scala -name *.scala) + jar cf util/target/jawn-util.jar -C util/target/classes . + # ast mkdir -p ast/target/classes - scalac -d ast/target/classes -cp parser/target/jawn-parser.jar $(shell find ast/src/main/scala -name *.scala) + scalac -d ast/target/classes -cp parser/target/jawn-parser.jar:util/target/jawn-util.jar $(shell find ast/src/main/scala -name *.scala) jar cf ast/target/jawn-ast.jar -C ast/target/classes . # support/argonaut (requires io.argonaut:argonaut) #mkdir -p support/argonaut/target/classes; \ - #scalac -d support/argonaut/target/classes -cp parser/target/jawn-parser.jar $(shell find support/argonaut/src/main/scala -name *.scala); \ + #scalac -d support/argonaut/target/classes -cp parser/target/jawn-parser.jar:util/target/jawn-util.jar $(shell find support/argonaut/src/main/scala -name *.scala); \ #jar cf support/argonaut/target/jawn-argonaut.jar -C support/argonaut/target/classes . ; \ # support/json4s mkdir -p support/json4s/target/classes; \ - scalac -d support/json4s/target/classes -cp parser/target/jawn-parser.jar:/usr/share/java/json4s-core.jar:/usr/share/java/json4s-ast.jar $(shell find support/json4s/src/main/scala -name *.scala); \ + scalac -d support/json4s/target/classes -cp parser/target/jawn-parser.jar:util/target/jawn-util.jar:/usr/share/java/json4s-core.jar:/usr/share/java/json4s-ast.jar $(shell find support/json4s/src/main/scala -name *.scala); \ jar cf support/json4s/target/jawn-json4s.jar -C support/json4s/target/classes . ; \ # support/play (requires com.typesafe.play:play-json) #mkdir -p support/play/target/classes; \ - #scalac -d support/play/target/classes -cp parser/target/jawn-parser.jar $(shell find support/play/src/main/scala -name *.scala); \ + #scalac -d support/play/target/classes -cp parser/target/jawn-parser.jar:util/target/jawn-util.jar $(shell find support/play/src/main/scala -name *.scala); \ #jar cf support/play/target/jawn-play.jar -C support/play/target/classes . ; \ # support/rojoma (requires com.rojoma:rojoma-json) #mkdir -p support/rojoma/target/classes; \ - #scalac -d support/rojoma/target/classes -cp parser/target/jawn-parser.jar $(shell find support/rojoma/src/main/scala -name *.scala); \ + #scalac -d support/rojoma/target/classes -cp parser/target/jawn-parser.jar:util/target/jawn-util.jar $(shell find support/rojoma/src/main/scala -name *.scala); \ #jar cf support/rojoma/target/jawn-rojoma.jar -C support/rojoma/target/classes . ; \ # support/rojoma-v3 (requires com.rojoma:rojoma-json-v3) #mkdir -p support/rojoma-v3/target/classes; \ - #scalac -d support/rojoma-v3/target/classes -cp parser/target/jawn-parser.jar $(shell find support/rojoma-v3/src/main/scala -name *.scala); \ + #scalac -d support/rojoma-v3/target/classes -cp parser/target/jawn-parser.jar:util/target/jawn-util.jar $(shell find support/rojoma-v3/src/main/scala -name *.scala); \ #jar cf support/rojoma-v3/target/jawn-rojoma-v3.jar -C support/rojoma-v3/target/classes . ; \ # support/spray (requires io.spray:spray-json) #mkdir -p support/spray/target/classes; \ - #scalac -d support/spray/target/classes -cp parser/target/jawn-parser.jar $(shell find support/spray/src/main/scala -name *.scala); \ + #scalac -d support/spray/target/classes -cp parser/target/jawn-parser.jar:util/target/jawn-util.jar $(shell find support/spray/src/main/scala -name *.scala); \ #jar cf support/spray/target/jawn-spray.jar -C support/spray/target/classes . ; \ get-orig-poms: - for MODULE in argonaut ast json4s parser play rojoma rojoma-v3 spray; do \ + for MODULE in argonaut ast json4s parser play rojoma rojoma-v3 spray util; do \ wget https://repo1.maven.org/maven2/org/spire-math/jawn-$${MODULE}_$(SCALA_BINARY_VERSION)/$(DEB_VERSION_UPSTREAM)/jawn-$${MODULE}_$(SCALA_BINARY_VERSION)-$(DEB_VERSION_UPSTREAM).pom -O debian/poms/jawn-$${MODULE}.pom; \ done