Update configuration #190

configure

@@ -1,13 +1,29 @@
 #!/bin/bash
 #
-# Copyright (c) 2014 nexB Inc. http://www.nexb.com/ - All rights reserved.
+# Copyright (c) 2015 nexB Inc. http://www.nexb.com/ - All rights reserved.
 #
+################################
+# change these variables to customize this script locally
+################################
+# you can define one or more thirdparty dirs, each prefixed with TPP_DIR
+export TPP_DIR="thirdparty"
+
+# default configurations
+CONF_DEFAULT="etc/conf"
+#################################
 
 CFG_CMD_LINE_ARGS="$@"
 
+if [ "$1" == "--init" ]; then
+    CFG_CMD_LINE_ARGS=$CONF_INIT
+fi
+
 if [ "$1" == "" ]; then
-    # default configuration if not argument is provided
-    CFG_CMD_LINE_ARGS="etc/conf"
+    # default conf if not argument is provided
+    CFG_CMD_LINE_ARGS=$CONF_DEFAULT
 fi
 
-source etc/configure $CFG_CMD_LINE_ARGS
+python2.7 etc/configure.py $CFG_CMD_LINE_ARGS
+if [ -f "bin/activate" ]; then
+    source bin/activate
+fi

configure.bat

@@ -1,12 +1,24 @@
 @echo OFF
-@rem Copyright (c) 2014 nexB Inc. http://www.nexb.com/ - All rights reserved.
 
-set ABOUT_ROOT_DIR=%~dp0
+@rem Copyright (c) 2015 nexB Inc. http://www.nexb.com/ - All rights reserved.
+
+@rem ################################
+@rem # change these variables to customize this script locally
+@rem ################################
+@rem # you can define one or more thirdparty dirs, each prefixed with TPP_DIR
+set TPP_DIR=thirdparty
+
+
+@rem # default configurations
+set CONF_DEFAULT="etc/conf"
+@rem #################################
 
 set CFG_CMD_LINE_ARGS= 
-@rem Collect all command line arguments in a variable
+@rem Collect/Slurp all command line arguments in a variable
 :collectarg
- if ""%1""=="""" goto continue
+ if ""%1""=="""" (
+    goto continue
+ )
  call set CFG_CMD_LINE_ARGS=%CFG_CMD_LINE_ARGS% %1
  shift
  goto collectarg
@@ -15,12 +27,20 @@ set CFG_CMD_LINE_ARGS=
 
 @rem default configuration when no args are passed
 if "%CFG_CMD_LINE_ARGS%"==" " (
-    set CFG_CMD_LINE_ARGS=etc/conf
+    set CFG_CMD_LINE_ARGS="%CONF_DEFAULT%"
+    goto configure
+)
+
+if "%CFG_CMD_LINE_ARGS%"=="  --init" (
+    set CFG_CMD_LINE_ARGS="%CONF_INIT%"
     goto configure
 )
 
 :configure
-call %ABOUT_ROOT_DIR%\etc\configure %CFG_CMD_LINE_ARGS%
+call c:\Python27\python.exe etc/configure.py %CFG_CMD_LINE_ARGS%
+if exist bin\activate (
+    bin\activate
+)
 goto EOS
 
-:EOS
+:EOS