Skip to content
This repository has been archived by the owner on Mar 1, 2018. It is now read-only.

Commit

Permalink
Small fixes and makefile
Browse files Browse the repository at this point in the history
  • Loading branch information
skjnldsv committed Sep 27, 2016
1 parent 9b849b1 commit 6db8598
Show file tree
Hide file tree
Showing 3 changed files with 43 additions and 3 deletions.
40 changes: 40 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion js/sync.js
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions templates/sync.php
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
</button>
<span class="tooltipped-bottom joinedbuttons"
title="Will sync birthdays for the contacts who doesn't have one set or if the already
defined date is older than the date we have">
defined date is older than the date we find">
<button id="syncbday" class="syncbutton">
Sync birthdays&nbsp;&nbsp;&nbsp;1
</button>
Expand Down Expand Up @@ -75,4 +75,4 @@

</div>

</div>
</div>

0 comments on commit 6db8598

Please sign in to comment.