浏览代码

* Add upload target

michael 7 年之前
父节点
当前提交
4f14632ee8
共有 2 个文件被更改,包括 82 次插入18 次删除
  1. 33 10
      Makefile
  2. 49 8
      Makefile.fpc

+ 33 - 10
Makefile

@@ -1,11 +1,11 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2017-09-21 rev 37286]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2017-12-27 rev 37833]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim i386-android i386-aros m68k-linux m68k-netbsd m68k-amiga m68k-atari m68k-palmos m68k-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded x86_64-iphonesim x86_64-aros x86_64-dragonfly arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux mipsel-embedded mipsel-android jvm-java jvm-android i8086-embedded i8086-msdos i8086-win16 aarch64-linux aarch64-darwin wasm-wasm sparc64-linux
 BSDs = freebsd netbsd openbsd darwin dragonfly
 UNIXs = linux $(BSDs) solaris qnx haiku aix
-LIMIT83fs = go32v2 os2 emx watcom msdos win16
+LIMIT83fs = go32v2 os2 emx watcom msdos win16 atari
 OSNeedsComspecToRunBatch = go32v2 watcom
 FORCE:
 .PHONY: FORCE
@@ -1588,7 +1588,10 @@ else
 endif
 .PHONY: democonfig demozip help demoupload
 ifndef PAS2JS
-PAS2JS=pas2js
+PAS2JS=bin/$(CPU_TARGET)-$(OS_TARGET)/pas2js$(EXEEXT)
+endif
+ifeq (,$(wildcard $(PAS2JS)))  
+PAS2JS=pas2js$(EXEEXT)
 endif
 PAS2JSVERSION:=$(shell $(PAS2JS) -iV)
 PACKAGEFILES=packages/rtl/rtl.js
@@ -1624,12 +1627,21 @@ DEMOFILES+=$(wildcard demo/fcldb/*.pas)
 DEMOFILES+=$(wildcard demo/fcldb/*.json)
 DEMOFILES+=demo/rtl/README.md
 DOCFILES+=docs/translation.html
-ZIPFILE=pas2js-$(PAS2JSVERSION).zip
+DEMOZIPFILE=pas2js-demo-$(PAS2JSVERSION).zip
 BINDIR=bin/$(CPU_TARGET)-$(OS_TARGET)
 COMPILERS=$(wildcard $BINDIR/*$(EXEEXT))
 COMPILERS+=$(wildcard $BINDIR/*$(SHAREDLIBEXT))
-URL=http://www.freepascal.org/~michael/pas2js/
 CFGFILE=bin/$(CPU_TARGET)-$(OS_TARGET)/pas2js.cfg
[email protected]
+SSHUPLOABASEDIR=ftp/contrib/pas2js
+SSHUPLOADVERSION=$(SSHUPLOABASEDIR)/$(PAS2JSVERSION)
+BASEURL=ftp://ftpmaster.freepascal.org/fpc/contrib/pas2js/
+ifeq (1,$(UNIXHier))
+ZIPEXT=.tar.gz
+else
+ZIPEXT=.zip
+endif
+DISTZIPFILE=$(FULLZIPNAME)$(ZIPEXT)
 help:
 	@echo "Detected pas2js version: $(PAS2JSVERSION)"
 	@echo "Supported targets:"
@@ -1640,17 +1652,28 @@ help:
 	@echo "distclean         clean + remove build files"
 	@echo "info              show all used variables"
 	@echo "zipinstall        create zip file which can be installed in a FPC installation."
+	@echo "upload            upload ZIP file created by zipinstall to FPC FTP site"
 	@echo "democonfig        create config file in bin dir"
 	@echo "demozip           create alternate demo zip file (deprecated)"
+	@echo "demoupload        upload alternate demo zip file (deprecated)"
+	@echo ""
+	@echo "Demo URL          $(BASEURL)$(DEMOZIPFILE)"
+	@echo "Distribution URL  $(BASEURL)$(PAS2JSVERSION)/$(DISTZIPFILE)"
 utils/createconfig$(SRCEXEEXT): utils/createconfig.pp
 	$(FPC) utils/createconfig.pp
 democonfig: utils/createconfig$(SRCEXEEXT)
 	utils/createconfig$(SRCEXEEXT) $(CFGFILE) ../..
-demozip: democonfig
+demozip: democonfig $(DEMOZIPFILE)
 	@echo Version: $(PAS2JSVERSION)
-	rm -f $(ZIPFILE)
+	rm -f $(DEMOZIPFILE)
 	cp compiler/utils/pas2js/dist/rtl.js packages/rtl
-	zip $(ZIPFILE) $(COMPILERS) $(RTLFILES) $(PACKAGEFILES) $(DOCFILES) $(DEMOFILES) $(CFGFILE)
+	zip $(DEMOZIPFILE) $(COMPILERS) $(RTLFILES) $(PACKAGEFILES) $(DOCFILES) $(DEMOFILES) $(CFGFILE)
 demoupload: demozip
-	scp $(ZIPFILE) idefix.freepascal.org:public_html/pas2js
-	@echo URL: $(URL)$(ZIPFILE)
+	ssh $(SSHUPLOAD) mkdir -p $(SSHUPLOADBASEDIR)
+	scp $(DEMOZIPFILE) $(SSHUPLOAD):$(SSHUPLOADBASEDIR)
+	@echo "Demo URL          $(BASEURL)$(DEMOZIPFILE)"
+$(DISTZIPFILE): zipinstall
+upload: $(DISTZIPFILE)
+	ssh $(SSHUPLOAD) mkdir -p $(SSHUPLOADVERSION)
+	scp $(DISTZIPFILE) $(SSHUPLOAD):$(SSHUPLOADVERSION)
+	@echo "Distribution URL  $(BASEURL)$(PAS2JSVERSION)/$(DISTZIPFILE)"

+ 49 - 8
Makefile.fpc

@@ -90,9 +90,15 @@ endif
 #
 .PHONY: democonfig demozip help demoupload
 ifndef PAS2JS
-PAS2JS=pas2js
+PAS2JS=bin/$(CPU_TARGET)-$(OS_TARGET)/pas2js$(EXEEXT)
+endif
+ifeq (,$(wildcard $(PAS2JS)))  
+PAS2JS=pas2js$(EXEEXT)
 endif
 PAS2JSVERSION:=$(shell $(PAS2JS) -iV)
+#
+# Demo zip
+#
 PACKAGEFILES=packages/rtl/rtl.js
 PACKAGEFILES+=$(wildcard packages/*/*.pas)
 PACKAGEFILES+=$(wildcard packages/*/*.pp)
@@ -126,12 +132,31 @@ DEMOFILES+=$(wildcard demo/fcldb/*.pas)
 DEMOFILES+=$(wildcard demo/fcldb/*.json)
 DEMOFILES+=demo/rtl/README.md
 DOCFILES+=docs/translation.html
-ZIPFILE=pas2js-$(PAS2JSVERSION).zip
+DEMOZIPFILE=pas2js-demo-$(PAS2JSVERSION).zip
 BINDIR=bin/$(CPU_TARGET)-$(OS_TARGET)
 COMPILERS=$(wildcard $BINDIR/*$(EXEEXT))
 COMPILERS+=$(wildcard $BINDIR/*$(SHAREDLIBEXT))
-URL=http://www.freepascal.org/~michael/pas2js/
 CFGFILE=bin/$(CPU_TARGET)-$(OS_TARGET)/pas2js.cfg
+#
+# End of demo zip
+#
+#
+# Upload
+#
[email protected]
+SSHUPLOABASEDIR=ftp/contrib/pas2js
+SSHUPLOADVERSION=$(SSHUPLOABASEDIR)/$(PAS2JSVERSION)
+BASEURL=ftp://ftpmaster.freepascal.org/fpc/contrib/pas2js/
+#
+# Dist zipfile filename
+#
+ifeq (1,$(UNIXHier))
+ZIPEXT=.tar.gz
+else
+ZIPEXT=.zip
+endif
+DISTZIPFILE=$(FULLZIPNAME)$(ZIPEXT)
+#
 
 help:
 	@echo "Detected pas2js version: $(PAS2JSVERSION)"
@@ -143,8 +168,13 @@ help:
 	@echo "distclean         clean + remove build files"
 	@echo "info              show all used variables"
 	@echo "zipinstall        create zip file which can be installed in a FPC installation."
+	@echo "upload            upload ZIP file created by zipinstall to FPC FTP site"
 	@echo "democonfig        create config file in bin dir"
 	@echo "demozip           create alternate demo zip file (deprecated)"
+	@echo "demoupload        upload alternate demo zip file (deprecated)"
+	@echo ""
+	@echo "Demo URL          $(BASEURL)$(DEMOZIPFILE)"
+	@echo "Distribution URL  $(BASEURL)$(PAS2JSVERSION)/$(DISTZIPFILE)"
 
 utils/createconfig$(SRCEXEEXT): utils/createconfig.pp
 	$(FPC) utils/createconfig.pp
@@ -152,13 +182,24 @@ utils/createconfig$(SRCEXEEXT): utils/createconfig.pp
 democonfig: utils/createconfig$(SRCEXEEXT)
 	utils/createconfig$(SRCEXEEXT) $(CFGFILE) ../..
 
-demozip: democonfig
+demozip: democonfig $(DEMOZIPFILE)
 	@echo Version: $(PAS2JSVERSION)
-	rm -f $(ZIPFILE)
+	rm -f $(DEMOZIPFILE)
         cp compiler/utils/pas2js/dist/rtl.js packages/rtl
-	zip $(ZIPFILE) $(COMPILERS) $(RTLFILES) $(PACKAGEFILES) $(DOCFILES) $(DEMOFILES) $(CFGFILE)
+	zip $(DEMOZIPFILE) $(COMPILERS) $(RTLFILES) $(PACKAGEFILES) $(DOCFILES) $(DEMOFILES) $(CFGFILE)
 
 demoupload: demozip
-	scp $(ZIPFILE) idefix.freepascal.org:public_html/pas2js
-	@echo URL: $(URL)$(ZIPFILE)
+	ssh $(SSHUPLOAD) mkdir -p $(SSHUPLOADBASEDIR)
+	scp $(DEMOZIPFILE) $(SSHUPLOAD):$(SSHUPLOADBASEDIR)
+	@echo "Demo URL          $(BASEURL)$(DEMOZIPFILE)"
+
+$(DISTZIPFILE): zipinstall
+
+upload: $(DISTZIPFILE)
+	ssh $(SSHUPLOAD) mkdir -p $(SSHUPLOADVERSION)
+	scp $(DISTZIPFILE) $(SSHUPLOAD):$(SSHUPLOADVERSION)
+	@echo "Distribution URL  $(BASEURL)$(PAS2JSVERSION)/$(DISTZIPFILE)"
+
+
+