Permalink
Browse files

alter version for rc and fix the makefile for deploy

  • Loading branch information...
1 parent a95cb79 commit d75be9471a15a0968bd5884b7d3ce1bf00342702 @johnbender johnbender committed Feb 27, 2012
Showing with 3 additions and 2 deletions.
  1. +2 −1 Makefile
  2. +1 −1 version.txt
View
3 Makefile
@@ -14,6 +14,7 @@ OUTPUT = compiled
# The name of the files
NAME = jquery.mobile
+BASE_NAME = jquery.mobile
STRUCTURE = jquery.mobile.structure
deploy: NAME = jquery.mobile-${VER_OFFICIAL}
deploy: STRUCTURE = jquery.mobile.structure-${VER_OFFICIAL}
@@ -95,7 +96,7 @@ docs: init
@@cat tmp/demos/LICENSE-INFO.txt | cat - tmp/demos/js/jquery.mobile.docs.js > tmp/demos/js/jquery.mobile.docs.js.tmp
@@cat tmp/demos/js/jquery.mobile.docs.js.tmp | ${SED_VER_API} > tmp/demos/js/jquery.mobile.docs.js
# ... Prepend versioned license to jquery.mobile.css
- @@cat tmp/demos/LICENSE-INFO.txt | cat - tmp/demos/css/themes/default/${NAME}.css > tmp/demos/css/themes/default/${NAME}.css.tmp
+ @@cat tmp/demos/LICENSE-INFO.txt | cat - tmp/demos/css/themes/default/${BASE_NAME}.css > tmp/demos/css/themes/default/${NAME}.css.tmp
@eddiemonge
eddiemonge added a line comment Mar 12, 2012

was there a reason to add base_name?

@johnbender
johnbender added a line comment Mar 13, 2012

Yes, deploy changes NAME which breaks the docs target. The docs target always wants the BASE_NAME and not the name with the version appended.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
@@mv tmp/demos/css/themes/default/${NAME}.css.tmp tmp/demos/css/themes/default/${NAME}.css
# ... replace "js/" with "js/jquery.mobile.docs.js"
@@ # NOTE the deletion here is required by gnu/bsd sed differences
View
2 version.txt
@@ -1 +1 @@
-1.1pre
+1.1.0-rc.1

0 comments on commit d75be94

Please sign in to comment.