From ca06241307e1ddbdfe248b2305cb6ecf90e70b08 Mon Sep 17 00:00:00 2001 From: Tony Tam Date: Tue, 30 Sep 2014 05:09:47 -0700 Subject: [PATCH] updated scripts --- bin/objc-petstore.sh | 2 +- bin/static-docs.sh | 11 +++-------- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/bin/objc-petstore.sh b/bin/objc-petstore.sh index 164eb72f11e..199ef4fb7ad 100755 --- a/bin/objc-petstore.sh +++ b/bin/objc-petstore.sh @@ -21,6 +21,6 @@ cd $APP_DIR # if you've executed sbt assembly previously it will use that instead. export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties" -ags="$@ com.wordnik.swagger.codegen.Codegen -i src/test/resources/petstore.json -l objc -o samples/client/petstore/objc" +ags="$@ com.wordnik.swagger.codegen.Codegen -i src/test/resources/petstore.json -l objc -o samples/client/petstore/objc -t src/main/resources/objc" java -cp $APP_DIR/target/*:$APP_DIR/target/lib/* $ags diff --git a/bin/static-docs.sh b/bin/static-docs.sh index af769fa79a8..f7a1e89c00d 100755 --- a/bin/static-docs.sh +++ b/bin/static-docs.sh @@ -1,7 +1,6 @@ #!/bin/sh SCRIPT="$0" -SCALA_RUNNER_VERSION=$(scala ./bin/Version.scala) while [ -h "$SCRIPT" ] ; do ls=`ls -ld "$SCRIPT"` @@ -22,11 +21,7 @@ cd $APP_DIR # if you've executed sbt assembly previously it will use that instead. -export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties " -ags="$@ com.wordnik.swagger.codegen.SwaggerDocGenerator http://petstore.swagger.wordnik.com/api/api-docs" +export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties" +ags="$@ com.wordnik.swagger.codegen.Codegen -i http://petstore.swagger.wordnik.com/v2/swagger.json -l static -o samples/swagger-static-docs" -if [ -f $APP_DIR/target/scala-$SCALA_RUNNER_VERSION/*assembly*.jar ]; then - scala -cp target/scala-$SCALA_RUNNER_VERSION/*assembly*.jar $ags -else - echo "Please set scalaVersion := \"$SCALA_RUNNER_VERSION\" in build.sbt and run ./sbt assembly" -fi +java -cp $APP_DIR/target/*:$APP_DIR/target/lib/* $ags