diff --git a/Makefile b/Makefile index 722b346..cf22a5f 100644 --- a/Makefile +++ b/Makefile @@ -1,38 +1,31 @@ -FILES =\ - fullcalendar\ - jquery\ - examples\ - changelog.txt - VER = `cat version.txt` -VVER = `cat ../version.txt` DATE = `svn info | grep Date: | sed 's/.*: //g'` REV = `svn info | grep Rev: | sed 's/.*: //g'` + +JS_SRC_FILES =\ + main.js\ + grid.js\ + view.js\ + util.js -min: - @java -jar build/yuicompressor-2.4.2.jar -o build/fullcalendar.min.js fullcalendar/fullcalendar.js - +CSS_SRC_FILES =\ + main.css\ + grid.css + +OTHER_FILES =\ + src/gcal.js\ + src/jquery\ + examples\ + changelog.txt + zip: - @mkdir -p build/fullcalendar-${VER} - @cp -rt build/fullcalendar-${VER} ${FILES} - @if [ -e build/fullcalendar.min.js ];\ - then cp build/fullcalendar.min.js build/fullcalendar-${VER}/fullcalendar;\ - else echo "\n!!! WARNING: fullcalendar.js not yet minified.\n";\ - fi - @rm -rf `find build/fullcalendar-* -type d -name .svn` - @for f in build/fullcalendar-${VER}/fullcalendar/*.js; do\ - sed -i "s/* FullCalendar/& v${VER}/" $$f;\ - sed -i "s/* Date:/& ${DATE}/" $$f;\ - sed -i "s/* Revision:/& ${REV}/" $$f;\ - done - @cd build; zip -r fullcalendar-${VVER}.zip fullcalendar-${VVER} - @mkdir -p dist - @mv build/fullcalendar-${VER}.zip dist - @rm -rf build/fullcalendar-${VER} - @rm -f build/fullcalendar.min.js - -clean: - @rm -rf dist/* - @rm -rf build/fullcalendar-* - @rm -f build/*.js + mkdir -p build/fullcalendar-${VER}/uncompressed + cd src; cat misc/head.txt ${JS_SRC_FILES} misc/foot.txt >\ + ../build/fullcalendar-`cat ../version.txt`/uncompressed/fullcalendar.js + cd src/css; cat ${CSS_SRC_FILES} >\ + ../../build/fullcalendar-`cat ../../version.txt`/fullcalendar.css + java -jar build/yuicompressor-2.4.2.jar\ + -o build/fullcalendar-${VER}/fullcalendar.js\ + build/fullcalendar-${VER}/uncompressed/fullcalendar.js + cp -rt build/fullcalendar-${VER} ${OTHER_FILES} \ No newline at end of file diff --git a/examples/new.html b/examples/new.html new file mode 100755 index 0000000..f9f229f --- /dev/null +++ b/examples/new.html @@ -0,0 +1,132 @@ + + + + + + + + + + + + + + + + + + + + +
+ \ No newline at end of file diff --git a/test/redmond/images/ui-bg_flat_0_aaaaaa_40x100.png b/examples/redmond/images/ui-bg_flat_0_aaaaaa_40x100.png similarity index 100% rename from test/redmond/images/ui-bg_flat_0_aaaaaa_40x100.png rename to examples/redmond/images/ui-bg_flat_0_aaaaaa_40x100.png diff --git a/test/redmond/images/ui-bg_flat_55_fbec88_40x100.png b/examples/redmond/images/ui-bg_flat_55_fbec88_40x100.png similarity index 100% rename from test/redmond/images/ui-bg_flat_55_fbec88_40x100.png rename to examples/redmond/images/ui-bg_flat_55_fbec88_40x100.png diff --git a/test/redmond/images/ui-bg_glass_75_d0e5f5_1x400.png b/examples/redmond/images/ui-bg_glass_75_d0e5f5_1x400.png similarity index 100% rename from test/redmond/images/ui-bg_glass_75_d0e5f5_1x400.png rename to examples/redmond/images/ui-bg_glass_75_d0e5f5_1x400.png diff --git a/test/redmond/images/ui-bg_glass_85_dfeffc_1x400.png b/examples/redmond/images/ui-bg_glass_85_dfeffc_1x400.png similarity index 100% rename from test/redmond/images/ui-bg_glass_85_dfeffc_1x400.png rename to examples/redmond/images/ui-bg_glass_85_dfeffc_1x400.png diff --git a/test/redmond/images/ui-bg_glass_95_fef1ec_1x400.png b/examples/redmond/images/ui-bg_glass_95_fef1ec_1x400.png similarity index 100% rename from test/redmond/images/ui-bg_glass_95_fef1ec_1x400.png rename to examples/redmond/images/ui-bg_glass_95_fef1ec_1x400.png diff --git a/test/redmond/images/ui-bg_gloss-wave_55_5c9ccc_500x100.png b/examples/redmond/images/ui-bg_gloss-wave_55_5c9ccc_500x100.png similarity index 100% rename from test/redmond/images/ui-bg_gloss-wave_55_5c9ccc_500x100.png rename to examples/redmond/images/ui-bg_gloss-wave_55_5c9ccc_500x100.png diff --git a/test/redmond/images/ui-bg_inset-hard_100_f5f8f9_1x100.png b/examples/redmond/images/ui-bg_inset-hard_100_f5f8f9_1x100.png similarity index 100% rename from test/redmond/images/ui-bg_inset-hard_100_f5f8f9_1x100.png rename to examples/redmond/images/ui-bg_inset-hard_100_f5f8f9_1x100.png diff --git a/test/redmond/images/ui-bg_inset-hard_100_fcfdfd_1x100.png b/examples/redmond/images/ui-bg_inset-hard_100_fcfdfd_1x100.png similarity index 100% rename from test/redmond/images/ui-bg_inset-hard_100_fcfdfd_1x100.png rename to examples/redmond/images/ui-bg_inset-hard_100_fcfdfd_1x100.png diff --git a/test/redmond/images/ui-icons_217bc0_256x240.png b/examples/redmond/images/ui-icons_217bc0_256x240.png similarity index 100% rename from test/redmond/images/ui-icons_217bc0_256x240.png rename to examples/redmond/images/ui-icons_217bc0_256x240.png diff --git a/test/redmond/images/ui-icons_2e83ff_256x240.png b/examples/redmond/images/ui-icons_2e83ff_256x240.png similarity index 100% rename from test/redmond/images/ui-icons_2e83ff_256x240.png rename to examples/redmond/images/ui-icons_2e83ff_256x240.png diff --git a/test/redmond/images/ui-icons_469bdd_256x240.png b/examples/redmond/images/ui-icons_469bdd_256x240.png similarity index 100% rename from test/redmond/images/ui-icons_469bdd_256x240.png rename to examples/redmond/images/ui-icons_469bdd_256x240.png diff --git a/test/redmond/images/ui-icons_6da8d5_256x240.png b/examples/redmond/images/ui-icons_6da8d5_256x240.png similarity index 100% rename from test/redmond/images/ui-icons_6da8d5_256x240.png rename to examples/redmond/images/ui-icons_6da8d5_256x240.png diff --git a/test/redmond/images/ui-icons_cd0a0a_256x240.png b/examples/redmond/images/ui-icons_cd0a0a_256x240.png similarity index 100% rename from test/redmond/images/ui-icons_cd0a0a_256x240.png rename to examples/redmond/images/ui-icons_cd0a0a_256x240.png diff --git a/test/redmond/images/ui-icons_d8e7f3_256x240.png b/examples/redmond/images/ui-icons_d8e7f3_256x240.png similarity index 100% rename from test/redmond/images/ui-icons_d8e7f3_256x240.png rename to examples/redmond/images/ui-icons_d8e7f3_256x240.png diff --git a/test/redmond/images/ui-icons_f9bd01_256x240.png b/examples/redmond/images/ui-icons_f9bd01_256x240.png similarity index 100% rename from test/redmond/images/ui-icons_f9bd01_256x240.png rename to examples/redmond/images/ui-icons_f9bd01_256x240.png diff --git a/test/redmond/theme.css b/examples/redmond/theme.css similarity index 100% rename from test/redmond/theme.css rename to examples/redmond/theme.css diff --git a/test/new.html b/test/new.html index c8a8d50..f9f229f 100755 --- a/test/new.html +++ b/test/new.html @@ -1,7 +1,6 @@ - diff --git a/version.txt b/version.txt index 6085e94..7e32cd5 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -1.2.1 +1.3