diff --git a/.travis.yml b/.travis.yml index eae13f70e..f0207c80e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ language: - c install: - - sudo apt-get install linuxdoc-tools linuxdoc-tools-info binutils-mingw-w64-i686 gcc-mingw-w64-i686 + - sudo apt-get install linuxdoc-tools linuxdoc-tools-info binutils-mingw-w64-i686 gcc-mingw-w64-i686 sshpass script: - make bin USER_CFLAGS=-Werror - make lib QUIET=1 @@ -10,6 +10,8 @@ script: - make doc zip after_success: - make -f Makefile.gh-pages + - make -f Makefile.sf-files env: global: - secure: "h+hoQdEHGPLNwaqGKmSaM8NBRDLc2X+W05VsnNG2Feq/wPv/AiBjONNlzN7jRf6D6f3aoPXaQ2Lc3bYWdxGvFRCmwiofdxkJI9n5L8HPHLZ2lf37MQsXmGJzoTFOvjPLj73H6HlbI9Ux0El3zO6hvalxiXj6TfoZ41dbhNyvpYk=" + - secure: "A4hMEe5RRfUtYjFGbT7QAvT1Tyo434N+/TiuQeQ4q0L46c79LnXuGQzbFLOFZshZiplLkJr7lFg466CoI1bf2L0cQOew/LesMhE75v0HQ7tZnExWhdpAk0ri6nWixbjn/dmQ0+HxjzJ48A44DMMBYcvSIsO4vflvuJ8etfSg42k=" diff --git a/Makefile.gh-pages b/Makefile.gh-pages index 4c6734ca6..39b497538 100644 --- a/Makefile.gh-pages +++ b/Makefile.gh-pages @@ -5,17 +5,16 @@ GH_PAGES = ../gh-pages all: - echo $(TRAVIS_COMMIT) | zip -z cc65 ifdef GH_TOKEN - git clone --branch=gh-pages https://$(GH_TOKEN)@github.com/cc65/cc65.git $(GH_PAGES) + @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 download - cd $(GH_PAGES) && mkdir doc download + cd $(GH_PAGES) && $(RM) -r doc + cd $(GH_PAGES) && mkdir doc cp html/*.* $(GH_PAGES)/doc - cp cc65.zip $(GH_PAGES)/download/cc65-snapshot-win32.zip - cd $(GH_PAGES) && git add -A doc download + 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 new file mode 100644 index 000000000..67c00e7ec --- /dev/null +++ b/Makefile.sf-files @@ -0,0 +1,16 @@ +.PHONY: all + +.SUFFIXES: + +SCPFLAGS = -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no + +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