Skip to content

Commit

Permalink
moved dev-time scripts into scripts/
Browse files Browse the repository at this point in the history
Change-Id: I6ceeb4d43dada4a96d5dc63d97855dec680b9ea7
Reviewed-on: http://review.membase.org/5267
Tested-by: Aliaksey Kandratsenka <alkondratenko@gmail.com>
Reviewed-by: Aliaksey Kandratsenka <alkondratenko@gmail.com>
  • Loading branch information
Aliaksey Kandratsenka authored and alk committed Apr 7, 2011
1 parent d19fc07 commit cf87b02
Show file tree
Hide file tree
Showing 7 changed files with 8 additions and 8 deletions.
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ ebins: src/ns_server.app.src
src/ns_server.app.src: src/ns_server.app.src.in $(TMP_VER)
(sed s/0.0.0/`cat $(TMP_VER)`/g $< > $@) || (rm $@ && false)

priv/public/js/all-images.js: priv/public/images priv/public/images/spinner build-all-images.rb
ruby build-all-images.rb >$@ || (rm $@ && false)
priv/public/js/all-images.js: priv/public/images priv/public/images/spinner scripts/build-all-images.rb
ruby scripts/build-all-images.rb >$@ || (rm $@ && false)

$(TMP_VER):
test -d $(TMP_DIR) || mkdir $(TMP_DIR)
Expand All @@ -59,7 +59,7 @@ NS_SERVER := $(PREFIX)/ns_server

install:
mkdir -p $(NS_SERVER)
tar cf - cluster_connect cluster_run mkcouch.sh mbcollect_info \
tar cf - cluster_connect cluster_run scripts/mkcouch.sh mbcollect_info \
ebin \
deps/*/ebin \
deps/*/deps/*/ebin \
Expand Down
2 changes: 1 addition & 1 deletion cluster_run
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ def start_cluster(num_nodes, extra_args):
os.makedirs(logdir)
except:
pass
subprocess.Popen(["./mkcouch.sh", "n_{0}".format(i), str(base_couch_port + i)]).communicate()
subprocess.Popen(["./scripts/mkcouch.sh", "n_{0}".format(i), str(base_couch_port + i)]).communicate()
args = ["erl", "+A", "16", "-pa"] + ebin_path + [
"-setcookie", "nocookie",
"-kernel", "inet_dist_listen_min", "21100",
Expand Down
2 changes: 1 addition & 1 deletion build-all-images.rb → scripts/build-all-images.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/env ruby

Dir.chdir(File.join(File.dirname(__FILE__), "priv/public"))
Dir.chdir(File.join(File.dirname(__FILE__), "..", "priv/public"))

print "var AllImages = ["
print(Dir["images/**/*"].select {|p| File.file? p}.map {|p| p.inspect}.join(", "))
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion only-web.rb → scripts/only-web.rb
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
require 'active_support/core_ext'
require 'pp'

Dir.chdir(File.dirname($0))
Dir.chdir(File.join(File.dirname($0), '..'))

$DOCROOT = 'priv/public'

Expand Down
2 changes: 1 addition & 1 deletion src/ns_test_util.erl
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ start_node(Name, MemcPort, MoxiPort, RestPort, CouchPort) ->

filelib:ensure_dir("logs/" ++ SName ++ "/"),

MkCouch = os:cmd(string:join(["./mkcouch.sh", SName, i2l(CouchPort)], " ")),
MkCouch = os:cmd(string:join(["./scripts/mkcouch.sh", SName, i2l(CouchPort)], " ")),
io:format("mkcouch: ~p~n", [MkCouch]),

Cmd = ["erl"
Expand Down
2 changes: 1 addition & 1 deletion start_shell.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ if [ -z "$DONT_START_EPMD" ]; then
erl -noshell -setcookie nocookie -sname init -run init stop 2>&1 > /dev/null
fi

./mkcouch.sh n_0 9500
./scripts/mkcouch.sh n_0 9500

exec erl \
+A 16 \
Expand Down

0 comments on commit cf87b02

Please sign in to comment.