tools: don't bother trying to set version strings automatically
This commit is contained in:
		
							parent
							
								
									1cf3692016
								
							
						
					
					
						commit
						210d476edf
					
				
							
								
								
									
										30
									
								
								Makefile
									
									
									
									
									
								
							
							
						
						
									
										30
									
								
								Makefile
									
									
									
									
									
								
							| @ -188,9 +188,8 @@ tools/generatejournal: tools/generatejournal.hs | |||||||
| 
 | 
 | ||||||
| hledgerall: bin/hledger hledger-web hledger-vty hledger-chart | hledgerall: bin/hledger hledger-web hledger-vty hledger-chart | ||||||
| 
 | 
 | ||||||
| # build developer binaries, as quickly as possible
 | # build a developer's binary, as quickly as possible
 | ||||||
| # this one is named bin/ to avoid case clash on mac
 | hledger: setversion | ||||||
| bin/hledger: |  | ||||||
| 	ghc --make $(MAIN) -o bin/hledger $(BUILDFLAGS) | 	ghc --make $(MAIN) -o bin/hledger $(BUILDFLAGS) | ||||||
| 
 | 
 | ||||||
| hledger-web: | hledger-web: | ||||||
| @ -220,22 +219,17 @@ hledgeropt: | |||||||
| 	ghc --make $(MAIN) -o bin/hledgeropt $(BUILDFLAGS) -O2 # -fvia-C # -fexcess-precision -optc-O3 -optc-ffast-math | 	ghc --make $(MAIN) -o bin/hledgeropt $(BUILDFLAGS) -O2 # -fvia-C # -fexcess-precision -optc-O3 -optc-ffast-math | ||||||
| 
 | 
 | ||||||
| # build a deployable binary for gnu/linux, statically linked
 | # build a deployable binary for gnu/linux, statically linked
 | ||||||
| hledgerlinux: | hledgerlinux: setversion | ||||||
| 	ghc --make $(MAIN) $(LINUXRELEASEBUILDFLAGS) -o bin/$(BINARYFILENAME) | 	cd hledger; \
 | ||||||
| 	-ghc --make hledger-web/hledger-web.hs $(LINUXRELEASEBUILDFLAGS) -o bin/`echo $(BINARYFILENAME) | sed -e 's/hledger/hledger-web/'` | 	ghc --make $(MAIN) -o bin/$(BINARYFILENAME) $(BUILDFLAGS) -O2 -static -optl-static -optl-pthread | ||||||
| 	-ghc --make hledger-vty/hledger-vty.hs $(LINUXRELEASEBUILDFLAGS) -o bin/`echo $(BINARYFILENAME) | sed -e 's/hledger/hledger-vty/'` | 	@echo 'Please check the build looks portable (statically linked):' | ||||||
| 	-ghc --make hledger-chart/hledger-chart.hs $(LINUXRELEASEBUILDFLAGS) -o bin/`echo $(BINARYFILENAME) | sed -e 's/hledger/hledger-chart/'` | 	-file bin/$(BINARYFILENAME) | ||||||
| 	@echo 'Please check the binaries look portable, then make compressbinaries:' |  | ||||||
| 	-file bin/*`arch` |  | ||||||
| 
 | 
 | ||||||
| # build a deployable binary for mac, using only standard osx libs
 | # build a deployable binary for mac, using only standard osx libs
 | ||||||
| hledgermac: | hledgermac: setversion | ||||||
| 	ghc --make $(MAIN) $(MACRELEASEBUILDFLAGS) -o bin/$(BINARYFILENAME) | 	ghc --make $(MAIN) -o bin/$(BINARYFILENAME) $(BUILDFLAGS) -O2 # -optl-L/usr/lib | ||||||
| 	-ghc --make hledger-web/hledger-web.hs $(MACRELEASEBUILDFLAGS) -o bin/`echo $(BINARYFILENAME) | sed -e 's/hledger/hledger-web/'` | 	@echo Please check the build looks portable: | ||||||
| 	-ghc --make hledger-vty/hledger-vty.hs $(MACRELEASEBUILDFLAGS) -o bin/`echo $(BINARYFILENAME) | sed -e 's/hledger/hledger-vty/'` | 	otool -L bin/$(BINARYFILENAME) | ||||||
| 	-ghc --make hledger-chart/hledger-chart.hs $(MACRELEASEBUILDFLAGS) -o bin/`echo $(BINARYFILENAME) | sed -e 's/hledger/hledger-chart/'` |  | ||||||
| 	@echo 'Please check the binaries look portable, then make compressbinaries:' |  | ||||||
| 	otool -L bin/*`arch` |  | ||||||
| 
 | 
 | ||||||
| # build deployable binaries for windows, assuming cygwin tools are present
 | # build deployable binaries for windows, assuming cygwin tools are present
 | ||||||
| hledgerwin: install | hledgerwin: install | ||||||
| @ -835,7 +829,7 @@ autowebmine: | |||||||
| # auto-recompile and run (with the specified argument) whenever a module changes.
 | # auto-recompile and run (with the specified argument) whenever a module changes.
 | ||||||
| # sp is from searchpath.org, you might need the patched version from
 | # sp is from searchpath.org, you might need the patched version from
 | ||||||
| # http://joyful.com/repos/searchpath.
 | # http://joyful.com/repos/searchpath.
 | ||||||
| # auto%: setversion
 | # auto%:
 | ||||||
| # 	sp --no-exts --no-default-map -o bin/hledger ghc --make $(MAIN) $(BUILDFLAGS) --run $*
 | # 	sp --no-exts --no-default-map -o bin/hledger ghc --make $(MAIN) $(BUILDFLAGS) --run $*
 | ||||||
| 
 | 
 | ||||||
| allsrclinks: | allsrclinks: | ||||||
|  | |||||||
		Loading…
	
		Reference in New Issue
	
	Block a user