Index: Makefile ================================================================== --- Makefile +++ Makefile @@ -172,14 +172,14 @@ csc -deploy $(OFILES) $(GOFILES) dashboard.scm -o deploytarg mv deploytarg/deploytarg deploytarg/dboard # DATASHAREO=configf.o common.o process.o tree.o dcommon.o margs.o launch.o gutils.o db.o synchash.o server.o \ # megatest-version.o tdb.o ods.o mt.o keys.o -datashare-testing/datashare : datashare.scm $(OFILES) - csc datashare.scm $(OFILES) -o datashare-testing/datashare +datashare-testing/sd : datashare.scm $(OFILES) + csc datashare.scm $(OFILES) -o datashare-testing/sd -datashare : datashare-testing/datashare +sd : datashare-testing/sd mkdir -p /tmp/$(USER)/datashare/disk1 /tmp/$(USER)/basepath -xterm : datashare +xterm : sd (export BASEPATH=/tmp/$(USER)/basepath ; export PATH="$(PWD)/datashare-testing:$(PATH)" ; xterm &) DELETED datashare-testing/.datashare.config Index: datashare-testing/.datashare.config ================================================================== --- datashare-testing/.datashare.config +++ /dev/null @@ -1,35 +0,0 @@ -# Read in the users vars first (so the offical data cannot be overridden -[include ~/.datashare.config] - -# Read in local overrides -[include datashare.config] - -# Replace [storage] with settings entry - more secure -[settings] - -storage /tmp/#{getenv USER}/datashare/disk1 \ - /tmp/#{getenv USER}/datashare/disk2 - -basepath #{getenv BASEPATH} - -[areas] -synthesis asic/synthesis -verilog asic/verilog -customlibs custom/oalibs -megatest tools/megatest - -[quality] -0 untested -1 lightly tested -2 tested -3 full QA - -[database] -location /tmp/#{getenv USER}/datashare - -[pathmaps] -SHELF /tmp/#{getenv USER}/theshelf - -[buildmethods] -customlibs make setup;make install - ADDED datashare-testing/.sd.config Index: datashare-testing/.sd.config ================================================================== --- /dev/null +++ datashare-testing/.sd.config @@ -0,0 +1,35 @@ +# Read in the users vars first (so the offical data cannot be overridden +[include ~/.datashare.config] + +# Read in local overrides +[include datashare.config] + +# Replace [storage] with settings entry - more secure +[settings] + +storage /tmp/#{getenv USER}/datashare/disk1 \ + /tmp/#{getenv USER}/datashare/disk2 + +basepath #{getenv BASEPATH} + +[areas] +synthesis asic/synthesis +verilog asic/verilog +customlibs custom/oalibs +megatest tools/megatest + +[quality] +0 untested +1 lightly tested +2 tested +3 full QA + +[database] +location /tmp/#{getenv USER}/datashare + +[pathmaps] +SHELF /tmp/#{getenv USER}/theshelf + +[buildmethods] +customlibs make setup;make install +