Makefile

@@ -5,45 +5,29 @@ FILES =\
 	examples\
 	changelog.txt
 	
-VER  = `cat version.txt`
-DATE = `svn info fullcalendar.js | grep Date: | sed 's/.*: //g'`
-REV  = `svn info fullcalendar.js | grep Rev: | sed 's/.*: //g'`
-
-hey:
-	@for f in fullcalendar/*.js; do echo $$f; done
+min:
+	@java -jar build/yuicompressor-2.4.2.jar -o build/fullcalendar.min.js fullcalendar/fullcalendar.js
+	sed -i "s/* FullCalendar/& v`cat version.txt`/" build/fullcalendar.min.js
+	sed -i "s/* Date:/& `svn info fullcalendar/fullcalendar.js | grep Date: | sed 's/.*: //g'`/" build/fullcalendar.min.js
+	sed -i "s/* Revision:/& `svn info fullcalendar/fullcalendar.js | grep Rev: | sed 's/.*: //g'`/" build/fullcalendar.min.js
 	
 zip:
 	@mkdir -p build/F
-	@cp -rt build/F ${FILES}
-	#@rm -rf `find build/fullcalendar -type d -name .svn`
-	
-q:
-	@for f in fullcalendar/*.js; do\
-		echo `svn info $$f`;\
+	@cp -rt build/F ${FILES} .svn
+	@for f in build/F/fullcalendar/*.js; do\
+		sed -i "s/* FullCalendar/& v`cat version.txt`/" $$f;\
+		sed -i "s/* Date:/& `svn info $$f | grep Date: | sed 's/.*: //g'`/" $$f;\
+		sed -i "s/* Revision:/& `svn info $$f | grep Rev: | sed 's/.*: //g'`/" $$f;\
 		done
-		
-yo:
-		
-		#sed -i "s/FullCalendar/& v`cat version.txt`/" $$f;\
-		#sed -i "s/Date:/& `svn info $$f | grep Date: | sed 's/.*: //g'`/" $$f;\
-		#sed -i "s/Revision:/& `svn info $$f | grep Rev: | sed 's/.*: //g'`/" $$f;\
-	
-	
-	#@cd build/fullcalendar; zip -r fullcalendar-`cat ../../version.txt`.zip *
-	#@mv build/fullcalendar/fullcalendar-`cat version.txt`.zip dist
-	#@rm -rf build/fullcalendar
-	
-something:
-	@cp -rt fullcalendar ${FILES}
-	@rm -rf `find fullcalendar -type d -name .svn`
-	
-	@sed -i "s/FullCalendar/& v${VER}/" fullcalendar/fullcalendar.js
-	@sed -i "s/Date:/& ${DATE}/" fullcalendar/fullcalendar.js
-	@sed -i "s/Revision:/& ${REV}/" fullcalendar/fullcalendar.js
-	
-	@mkdir -p dist
-	@zip -r dist/fullcalendar-${VER}.zip fullcalendar
-	@rm -rf fullcalendar
+	@rm -rf `find build/F -type d -name .svn`
+	@if [ -e build/fullcalendar.min.js ];\
+		then cp build/fullcalendar.min.js build/F/fullcalendar;\
+		else echo "WARNING: fullcalendar.js not yet minified.";\
+		fi
+	@cd build/F; zip -r fullcalendar-`cat ../../version.txt`.zip *
+	@mv build/F/fullcalendar-*.zip dist
+	@rm -rf build/F
+	@rm -f build/fullcalendar.min.js
 	
 clean:
 	@rm -rf dist/*

examples/basic.html

@@ -16,11 +16,11 @@
 		}
 
 </style>
-<link rel='stylesheet' type='text/css' href='../fullcalendar.css' />
+<link rel='stylesheet' type='text/css' href='../fullcalendar/fullcalendar.css' />
 <script type='text/javascript' src='../jquery/jquery.js'></script>
 <script type='text/javascript' src='../jquery/ui.core.js'></script>
 <script type='text/javascript' src='../jquery/ui.draggable.js'></script>
-<script type='text/javascript' src='../fullcalendar.js'></script>
+<script type='text/javascript' src='../fullcalendar/fullcalendar.js'></script>
 <script type='text/javascript'>
 
 	$(document).ready(function() {

examples/gcal.html

@@ -22,10 +22,10 @@
 		}
 
 </style>
-<link rel='stylesheet' type='text/css' href='../fullcalendar.css' />
+<link rel='stylesheet' type='text/css' href='../fullcalendar/fullcalendar.css' />
 <script type='text/javascript' src='../jquery/jquery.js'></script>
-<script type='text/javascript' src='../fullcalendar.js'></script>
-<script type='text/javascript' src='../gcal.js'></script>
+<script type='text/javascript' src='../fullcalendar/fullcalendar.js'></script>
+<script type='text/javascript' src='../fullcalendar/gcal.js'></script>
 <script type='text/javascript'>
 
 	$(document).ready(function() {

examples/json.html

@@ -22,11 +22,11 @@
 		}
 
 </style>
-<link rel='stylesheet' type='text/css' href='../fullcalendar.css' />
+<link rel='stylesheet' type='text/css' href='../fullcalendar/fullcalendar.css' />
 <script type='text/javascript' src='../jquery/jquery.js'></script>
 <script type='text/javascript' src='../jquery/ui.core.js'></script>
 <script type='text/javascript' src='../jquery/ui.draggable.js'></script>
-<script type='text/javascript' src='../fullcalendar.js'></script>
+<script type='text/javascript' src='../fullcalendar/fullcalendar.js'></script>
 <script type='text/javascript'>
 
 	$(document).ready(function() {

fullcalendar/fullcalendar.js

@@ -1,4 +1,4 @@
-/*
+/*!
  * FullCalendar
  * http://arshaw.com/fullcalendar/
  *

version.txt

@@ -1 +1 @@
-1.1
+1.2