diff options
| -rwxr-xr-x | INSTALL.sh | 3 | ||||
| -rw-r--r-- | Makefile | 18 | ||||
| -rw-r--r-- | public-src/3rd-party/.gitignore | 1 | ||||
| -rw-r--r-- | public-src/require.config.js | 8 |
4 files changed, 13 insertions, 17 deletions
@@ -17,3 +17,6 @@ sudo pacman -S --needed -- ruby-sass # Yarn sudo pacman -S --needed -- yarn + +# Wget +sudo pacman -S --needed -- wget @@ -5,7 +5,6 @@ outs = $(patsubst public-src/%,public/%,\ $(srcs)))) all: $(outs) all: public/3rd-party -all: jarmon-dependencies .PHONY: all NET-%: @@ -54,21 +53,14 @@ public/tls.html.part public/crtsh.html.part public/diff.html.part: \ public/%.html.part: public/%.pem bin/%-pem2html bin/$*-pem2html < $< > $@ -public-src/jarmon-depenencies: jarmon/docs/examples/assets/js/dependencies.js -jarmon/docs/examples/assets/js/dependencies.js: FORCE - $(MAKE) -C jarmon docs/examples/assets/js/dependencies.js - public-src/3rd-party/yarn.LICENSES.txt: bin/yarn-bower public-src/3rd-party/package.json $(wildcard public-src/3rd-party/yarn.lock) bin/yarn-bower install bin/yarn-bower licenses generate-disclaimer > $@ public/3rd-party: public-src/3rd-party/yarn.LICENSES.txt +public/3rd-party: public-src/3rd-party/jquery-1.6.3.js +public/3rd-party: + @touch $@ public-src/jarmon-style/%.gif: public-src/3rd-party/yarn.LICENSES.txt @test -f $@ - -jquery-ver=1.6.3 - -jarmon-dependencies: public-src/jarmon-dependencies/jquery-$(jquery-ver).js - -public-src/jarmon-dependencies/jquery-%.js: - @mkdir -p '$(@D)' - wget -O $@ 'http://code.jquery.com/jquery-$*.js' +public-src/3rd-party/jquery-%.js: + wget -O - 'http://code.jquery.com/jquery-$*.js' > $@ diff --git a/public-src/3rd-party/.gitignore b/public-src/3rd-party/.gitignore index 4574e17..648c720 100644 --- a/public-src/3rd-party/.gitignore +++ b/public-src/3rd-party/.gitignore @@ -1,3 +1,4 @@ /yarn/ /yarn.LICENSES.txt *.log +/jquery-* diff --git a/public-src/require.config.js b/public-src/require.config.js index 5094bf1..e824aaa 100644 --- a/public-src/require.config.js +++ b/public-src/require.config.js @@ -28,13 +28,13 @@ var require = { }, paths: { "flot" : "/3rd-party/yarn/flot", - //"jquery" : "/3rd-party/yarn/jquery/dist/jquery", - "requirejs" : "/3rd-party/yarn/requirejs/require", + "jarmon" : "/3rd-party/yarn/jarmon/jarmon/jarmon", "javascriptrrd" : "/3rd-party/yarn/javascriptrrd/src/lib", "jquerytools" : "/3rd-party/yarn/jquerytools/src", - "jarmon" : "/3rd-party/yarn/jarmon/jarmon/jarmon", + "requirejs" : "/3rd-party/yarn/requirejs/require", + + "jquery" : "/3rd-party/jquery-1.6.3", "cfg" : "/cfg", - "jquery" : "/jarmon-dependencies/jquery-1.6.3", }, }; |