From 7e96f539872dc28d040b24b9aa81f7cf08f8cbf3 Mon Sep 17 00:00:00 2001 From: Christopher Vogt Date: Sat, 1 Apr 2017 13:40:29 -0400 Subject: hopefully more self-explanatory name --- libraries/reflect/reflect.scala | 8 ++++---- stage1/Stage1Lib.scala | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/libraries/reflect/reflect.scala b/libraries/reflect/reflect.scala index bd7c245..c2b05ed 100644 --- a/libraries/reflect/reflect.scala +++ b/libraries/reflect/reflect.scala @@ -65,7 +65,7 @@ package ops { } trait Module { def getMain( cls: Class[_] ): StaticMethod[Seq[String], ExitCode] = { - val f = findStaticExitMethodForced[Array[String]]( cls, "main" ) + val f = findStaticExitMethodOrFail[Array[String]]( cls, "main" ) f.copy( function = ( args: Seq[String] ) => f.function( args.to ) ) @@ -113,16 +113,16 @@ trait Module { .replace( File.separator, "." ) } - def findStaticExitMethodForced[Arg: ClassTag]( + def findStaticExitMethodOrFail[Arg: ClassTag]( cls: Class[_], name: String ): StaticMethod[Arg, ExitCode] = { - val f = findStaticMethodForced[Arg, Unit]( cls, name ) + val f = findStaticMethodOrFail[Arg, Unit]( cls, name ) f.copy( function = arg => trapExitCode { f.function( arg ); ExitCode.Success } ) } - def findStaticMethodForced[Arg, Result]( + def findStaticMethodOrFail[Arg, Result]( cls: Class[_], name: String )( implicit diff --git a/stage1/Stage1Lib.scala b/stage1/Stage1Lib.scala index 392b885..6e2963e 100644 --- a/stage1/Stage1Lib.scala +++ b/stage1/Stage1Lib.scala @@ -80,7 +80,7 @@ class Stage1Lib( logger: Logger ) extends } def getCbtMain( cls: Class[_] ): cbt.reflect.StaticMethod[Context, ExitCode] = - findStaticMethodForced[Context, ExitCode]( cls, "cbtMain" ) + findStaticMethodOrFail[Context, ExitCode]( cls, "cbtMain" ) def findCbtMain( cls: Class[_] ): Option[cbt.reflect.StaticMethod[Context, ExitCode]] = findStaticMethod[Context, ExitCode]( cls, "cbtMain" ) @@ -376,7 +376,7 @@ ${sourceFiles.sorted.mkString(" \\\n")} case d => d } - def classLoaderRecursion( dependency: Dependency, latest: Map[(String,String),Dependency])(implicit transientCache: java.util.Map[AnyRef,AnyRef], cache: ClassLoaderCache): ClassLoader = { + def classLoaderRecursion( dependency: Dependency, latest: Map[(String,String),Dependency] )(implicit transientCache: java.util.Map[AnyRef,AnyRef], cache: ClassLoaderCache): ClassLoader = { // FIXME: shouldn't we be using KeyLockedLazyCache instead of hashmap directly here? val dependencies = dependency.dependencies.toVector val dependencyClassLoader: ClassLoader = { -- cgit v1.2.3 From 99d3123cdbff73cb9a9dd49bc334b47a5a8b6021 Mon Sep 17 00:00:00 2001 From: Christopher Vogt Date: Sat, 1 Apr 2017 13:44:08 -0400 Subject: saner -debug behavior --- cbt | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/cbt b/cbt index 6e32e50..eac3987 100755 --- a/cbt +++ b/cbt @@ -137,6 +137,10 @@ foo(){ foo "$@" +if [ ! "$DEBUG" == "" ]; then + shift +fi + JAVA_OPTS_CBT=($DEBUG -Xmx1536m -Xss10M -XX:MaxJavaStackTraceDepth=-1 -XX:+TieredCompilation -XX:TieredStopAtLevel=1 -Xverify:none) # ng on osx, install via brew install nailgun @@ -200,10 +204,19 @@ if [ $nailgun_installed -eq 1 ] || [ "$1" = "publishSigned" ]; then use_nailgun=1 fi +if [ $server_up -eq 0 ] && [ ! "$DEBUG" == "" ]; then + echo "Can't use \`-debug\` (without \`direct\`) when nailgun is already running. If you started it up with \`-debug\` you can still connect to it. Otherwise use \`cbt kill\` to kill it." + exit 1 +fi + if [ $use_nailgun -eq 0 ] && [ ! $server_up -eq 0 ]; then log "Starting background process (nailgun)" "$@" # try to start nailgun-server, just in case it's not up java "${options[@]}" "${JAVA_OPTS_CBT[@]}" -jar "$NG_SERVER_JAR" 127.0.0.1:$NAILGUN_PORT >> "$nailgun_out" 2>> "$nailgun_err" & + if [ ! "$DEBUG" == "" ]; then + echo "Started nailgun server in debug mode" + exit 1 + fi fi stage1 () { -- cgit v1.2.3