Created
November 14, 2009 11:04
-
-
Save djtal/234479 to your computer and use it in GitHub Desktop.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| From 8539739dba84f29013359b99dee7d8e3e0473055 Mon Sep 17 00:00:00 2001 | |
| From: djtal <guillaume.garcera@gmail.com> | |
| Date: Sat, 14 Nov 2009 11:54:09 +0100 | |
| Subject: [PATCH] Add a missing submodule path | |
| change to SCRIPTY2_DIST_DIR instead of SCRIPTY2_DEBUG_DIR since it has been modified in commit 81e0e05706f4050249d20e89d9f4c5b7a1705937 | |
| --- | |
| .gitmodules | 1 + | |
| Rakefile | 7 ++++--- | |
| 2 files changed, 5 insertions(+), 3 deletions(-) | |
| diff --git a/.gitmodules b/.gitmodules | |
| index ff98b41..454b927 100644 | |
| --- a/.gitmodules | |
| +++ b/.gitmodules | |
| @@ -6,3 +6,4 @@ | |
| url = git://github.com/tobie/pdoc.git | |
| [submodule "vendor/sprockets"] | |
| path = vendor/sprockets | |
| + url = git://github.com/sstephenson/sprockets.git | |
| diff --git a/Rakefile b/Rakefile | |
| index 95e8111..a3c7dd1 100644 | |
| --- a/Rakefile | |
| +++ b/Rakefile | |
| @@ -52,6 +52,7 @@ desc "Builds the distribution." | |
| task :dist do | |
| sprocketize("src", "s2.js") | |
| cp File.join(SCRIPTY2_ROOT,'lib','prototype.js'), File.join(SCRIPTY2_DIST_DIR,'prototype.js') | |
| + | |
| end | |
| def minify(src, target) | |
| @@ -72,13 +73,13 @@ end | |
| desc "Generates a minified version of the distribution." | |
| task :min do | |
| - minify File.join(SCRIPTY2_DEBUG_DIR,'s2.js'), File.join(SCRIPTY2_RELEASE_DIR,'s2.min.js') | |
| + minify File.join(SCRIPTY2_DIST_DIR,'s2.js'), File.join(SCRIPTY2_RELEASE_DIR,'s2.min.js') | |
| minify File.join(SCRIPTY2_ROOT,'lib','prototype.js'), File.join(SCRIPTY2_RELEASE_DIR,'prototype.min.js') | |
| end | |
| desc "Generate a unified minified version of Prototype and scripty2" | |
| task :unified => [:dist, :min] do | |
| - unified = IO.read(File.join(SCRIPTY2_DEBUG_DIR,'prototype.js')) + IO.read(File.join(SCRIPTY2_DEBUG_DIR,'s2.js')) | |
| + unified = IO.read(File.join(SCRIPTY2_DIST_DIR,'prototype.js')) + IO.read(File.join(SCRIPTY2_DIST_DIR,'s2.js')) | |
| File.open(File.join(SCRIPTY2_DEBUG_DIR,'prototype.s2.js'), 'w') do |file| | |
| file.write unified | |
| end | |
| @@ -126,7 +127,7 @@ namespace :doc do | |
| end | |
| cp File.join(SCRIPTY2_ROOT, 'lib', 'prototype.js'), File.join(SCRIPTY2_DOC_DIR, 'javascripts') | |
| - cp File.join(SCRIPTY2_DEBUG_DIR,'s2.js'), File.join(SCRIPTY2_DOC_DIR,'javascripts') | |
| + cp File.join(SCRIPTY2_DIST_DIR,'s2.js'), File.join(SCRIPTY2_DOC_DIR,'javascripts') | |
| end | |
| task :require do | |
| -- | |
| 1.6.5.1 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment