diff --git a/Makefile b/Makefile new file mode 100755 index 0000000..4781ef4 --- /dev/null +++ b/Makefile @@ -0,0 +1,40 @@ +# Makefile for building the project + +app_name=fbsync +project_dir=$(CURDIR)/../$(app_name) +build_dir=$(CURDIR)/build/artifacts +appstore_dir=$(build_dir)/appstore +source_dir=$(build_dir)/source +package_name=$(app_name) + +all: dist + +clean: + rm -rf $(build_dir) + +dist: clean + mkdir -p $(source_dir) + tar cvzf $(source_dir)/$(package_name).tar.gz $(project_dir) \ + --exclude-vcs \ + --exclude=$(project_dir)/build/artifacts \ + --exclude=$(project_dir)/js/node_modules \ + --exclude=$(project_dir)/js/coverage + +appstore_package: clean + mkdir -p $(appstore_dir) + tar cvzf $(appstore_dir)/$(package_name).tar.gz $(project_dir) \ + --exclude-vcs \ + --exclude=$(project_dir)/build \ + --exclude=$(project_dir)/js/node_modules \ + --exclude=$(project_dir)/js/.bowerrc \ + --exclude=$(project_dir)/js/.jshintrc \ + --exclude=$(project_dir)/js/Gruntfile.js \ + --exclude=$(project_dir)/js/*.json \ + --exclude=$(project_dir)/js/*.conf.js \ + --exclude=$(project_dir)/js/*.log \ + --exclude=$(project_dir)/js/README.md \ + --exclude=$(project_dir)/js/.bowerrc \ + --exclude=$(project_dir)/.travis.yml \ + --exclude=$(project_dir)/phpunit*xml \ + --exclude=$(project_dir)/Makefile \ + --exclude=$(project_dir)/tests \ No newline at end of file diff --git a/js/sync.js b/js/sync.js index 881d5ae..ab44b7b 100755 --- a/js/sync.js +++ b/js/sync.js @@ -217,7 +217,7 @@ function syncBirthdaysAlt() { syncBirthdays(); }) $("#syncbdayalt").click(function() { - if (confirm("This secondary button uses the facebook calendar to get the desired data. It's useful if you don't want to change your facebook language to get the first method working or if the 1 button is failing. Please remember that the saved year won't be correct.")) { + if (confirm("This secondary button uses the facebook calendar to get the desired data. It's useful if you don't want to change your facebook langage to get the first method working or if the 1 button is failing. Please remember that the saved year won't be correct.")) { // Fix for tooltip on disabled buttons $('.tooltip').fadeOut(); // Save and set new text diff --git a/templates/sync.php b/templates/sync.php index b06a47f..acee19d 100755 --- a/templates/sync.php +++ b/templates/sync.php @@ -31,7 +31,7 @@ + defined date is older than the date we find"> @@ -75,4 +75,4 @@ - \ No newline at end of file +