From 91b9451c60682c0fda984750406d58b1b019f87e Mon Sep 17 00:00:00 2001
From: Oliver Schmidt
Date: Sat, 1 Nov 2014 13:45:17 +0100
Subject: [PATCH] Reduced clutter in root dir.
---
Makefile.gh-pages | 20 --------------------
Makefile.sf-files | 16 ----------------
Makefile.travis | 37 +++++++++++++++++++++++++++++++++++++
3 files changed, 37 insertions(+), 36 deletions(-)
delete mode 100644 Makefile.gh-pages
delete mode 100644 Makefile.sf-files
create mode 100644 Makefile.travis
diff --git a/Makefile.gh-pages b/Makefile.gh-pages
deleted file mode 100644
index 10ee4583b..000000000
--- a/Makefile.gh-pages
+++ /dev/null
@@ -1,20 +0,0 @@
-.PHONY: all
-
-.SUFFIXES:
-
-GH_PAGES = ../gh-pages
-
-all:
-ifdef GH_TOKEN
- @echo 'git clone --branch=gh-pages https://$$(GH_TOKEN)@github.com/cc65/cc65.git $(GH_PAGES)'
- @git clone --branch=gh-pages https://$(GH_TOKEN)@github.com/cc65/cc65.git $(GH_PAGES)
- cd $(GH_PAGES) && git config user.name "Oliver Schmidt"
- cd $(GH_PAGES) && git config user.email "ol.sc@web.de"
- cd $(GH_PAGES) && git config push.default simple
- cd $(GH_PAGES) && $(RM) -r doc
- cd $(GH_PAGES) && mkdir doc
- cp html/*.* $(GH_PAGES)/doc
- cd $(GH_PAGES) && git add -A doc
- -cd $(GH_PAGES) && git commit -m "Updated from commit $(TRAVIS_COMMIT)."
- cd $(GH_PAGES) && git push
-endif
diff --git a/Makefile.sf-files b/Makefile.sf-files
deleted file mode 100644
index 0eefffc77..000000000
--- a/Makefile.sf-files
+++ /dev/null
@@ -1,16 +0,0 @@
-.PHONY: all
-
-.SUFFIXES:
-
-SCPFLAGS = -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -q
-
-SF_USER = oliverschmidt
-SF_HOST = frs.sourceforge.net
-SF_FILE = /home/frs/project/cc65/cc65-snapshot-win64.zip
-
-all:
- echo $(TRAVIS_COMMIT) | zip -z cc65
-ifdef SF_PASS
- @echo 'sshpass -p $$(SF_PASS) scp $(SCPFLAGS) cc65.zip $(SF_USER)@$(SF_HOST):$(SF_FILE)'
- @sshpass -p $(SF_PASS) scp $(SCPFLAGS) cc65.zip $(SF_USER)@$(SF_HOST):$(SF_FILE)
-endif
diff --git a/Makefile.travis b/Makefile.travis
new file mode 100644
index 000000000..6f83e2439
--- /dev/null
+++ b/Makefile.travis
@@ -0,0 +1,37 @@
+.PHONY: all gh-pages sf-files
+
+.SUFFIXES:
+
+all: gh-pages sf-files
+
+GH_NAME = Oliver Schmidt
+GH_MAIL = ol.sc@web.de
+GH_PATH = ../gh-pages
+
+gh-pages:
+ifdef GH_TOKEN
+ @echo 'git clone --branch=gh-pages https://$$(GH_TOKEN)@github.com/cc65/cc65.git $(GH_PATH)'
+ @git clone --branch=gh-pages https://$(GH_TOKEN)@github.com/cc65/cc65.git $(GH_PATH)
+ cd $(GH_PATH) && git config user.name "$(GH_NAME)"
+ cd $(GH_PATH) && git config user.email "$(GH_MAIL)"
+ cd $(GH_PATH) && git config push.default simple
+ cd $(GH_PATH) && $(RM) -r doc
+ cd $(GH_PATH) && mkdir doc
+ cp html/*.* $(GH_PATH)/doc
+ cd $(GH_PATH) && git add -A doc
+ -cd $(GH_PATH) && git commit -m "Updated from commit $(TRAVIS_COMMIT)."
+ cd $(GH_PATH) && git push
+endif
+
+SF_USER = oliverschmidt
+SF_HOST = frs.sourceforge.net
+SF_FILE = /home/frs/project/cc65/cc65-snapshot-win64.zip
+
+SCPFLAGS = -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -q
+
+sf-files:
+ifdef SF_PASS
+ echo $(TRAVIS_COMMIT) | zip -z cc65
+ @echo 'sshpass -p $$(SF_PASS) scp $(SCPFLAGS) cc65.zip $(SF_USER)@$(SF_HOST):$(SF_FILE)'
+ @sshpass -p $(SF_PASS) scp $(SCPFLAGS) cc65.zip $(SF_USER)@$(SF_HOST):$(SF_FILE)
+endif