m/grafX2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update some things after the switch to git.

Browse Source 
- Do not use svnversion to find the version, instead use a revision
  count from git. As a result, the version number jumps back, however,
  so we should have a 2.5 release soon!
- Fix some URLs pointing to either the svn repo,
  or even to google code (!).
This commit is contained in:
Adrien Destugues 2017-03-23 07:29:26 +01:00
parent 903701727d
commit cf56a34992
3 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/COMPILING.txt
View File

@ -67,8 +67,8 @@ Erases all generated files (intermediate objects, and executable)
make depend make depend
Re-compute the dependencies (makefile.dep). Re-compute the dependencies (makefile.dep).
Other compilation targets (make version, make ziprelease) require Subversion Other compilation targets (make version, make ziprelease) require git
and are only useful to contributors to the svn repository of Grafx2. and are only useful to contributors to the git repository of Grafx2.
=== System specifics === === System specifics ===

8
doc/README.txt
View File

@ -23,7 +23,7 @@ eventually like to draw the oldskool way !
Grafx2 was originally written for the MS-DOS operating system. The authors then Grafx2 was originally written for the MS-DOS operating system. The authors then
released the sourcecode and we've modified it to run on your favorite platform released the sourcecode and we've modified it to run on your favorite platform
(if we missed it, please tell us !). Check the homepage at (if we missed it, please tell us !). Check the homepage at
http://code.google.com/p/grafx2 for latest news and bugfixed versions. http://pulkomandy.tk/projects/GrafX2 for latest news and bugfixed versions.
=== HELP === === HELP ===
@ -49,10 +49,10 @@ The font Tuffy.ttf included as a sample in the fonts directory is public domain.
The source code of Grafx2 should always be distributed along with the The source code of Grafx2 should always be distributed along with the
executable; You can normally find it in a packed archive whose name begins by executable; You can normally find it in a packed archive whose name begins by
"src". The source code is also available on the web site, either by accessing "src". The source code is also available on the web site, either by accessing
the Subversion repository: the git repository:
svn://pulkomandy.tk/GrafX2/ https://gitlab.com/GrafX2/grafX2.git
or you can find the latest versions as packed archives: or you can find the latest versions as packed archives:
http://code.google.com/p/grafx2/wiki/Downloads http://pulkomandy.tk/projects/GrafX2/downloads
=== COMPILING === === COMPILING ===

12
src/Makefile
View File

@ -32,6 +32,9 @@
# Compile with OPTIM=0 to disable gcc optimizations, to enable debug. # Compile with OPTIM=0 to disable gcc optimizations, to enable debug.
STRIP = strip STRIP = strip
# Detect GIT revision
GIT_REVISION = $(shell git rev-list --count 1af8c74f53110e349d8f0d19b14599281913f71f..)
### Specific to build MAC OS X universal binaries on Tiger or Lion ### ### Specific to build MAC OS X universal binaries on Tiger or Lion ###
### (may need to be changed or removed depending on the OSX version) ### ### (may need to be changed or removed depending on the OSX version) ###
@ -103,7 +106,6 @@ else
# Where the SDL frameworks are located # Where the SDL frameworks are located
FWDIR = /Library/Frameworks FWDIR = /Library/Frameworks
BIN = ../bin/grafx2 BIN = ../bin/grafx2
SVN_REVISION = $(shell svnversion | cut -f2 -d ":" - | tr -d "M")
SDLCONFIG := $(shell which sdl-config) SDLCONFIG := $(shell which sdl-config)
ifneq ($(SDLCONFIG), ) ifneq ($(SDLCONFIG), )
@ -533,7 +535,7 @@ endif
cp $(BIN) $(MACAPPEXE) cp $(BIN) $(MACAPPEXE)
$(STRIP) -x -X -S $(MACAPPEXE) $(STRIP) -x -X -S $(MACAPPEXE)
chmod +x $(MACAPPEXE) chmod +x $(MACAPPEXE)
tar cvzf grafx2-svn$(SVN_REVISION)-macosx.tgz --exclude '*svn*' --exclude '*DS_Store*' Grafx2.app/* tar cvzf grafx2-git$(GIT_REVISION)-macosx.tgz --exclude '.git' --exclude '*DS_Store*' Grafx2.app/*
else else
all : $(BIN) all : $(BIN)
ifeq ($(ATARICROSS),1) ifeq ($(ATARICROSS),1)
@ -566,7 +568,7 @@ release : version $(BIN)
# Create a zip archive ready for upload to the website, including binaries and sourcecode # Create a zip archive ready for upload to the website, including binaries and sourcecode
ziprelease: version $(BIN) release ziprelease: version $(BIN) release
echo `sed "s/.*=\"\(.*\)\";/\1/" pversion.c`.`svnversion` | tr " :" "_-" | sed -e "s/\(wip\)\\./\1/I" > $(OBJDIR)/versiontag echo `sed "s/.*=\"\(.*\)\";/\1/" pversion.c`.$(GIT_REVISION) | tr " :" "_-" | sed -e "s/\(wip\)\\./\1/I" > $(OBJDIR)/versiontag
tar cvzf "../src-`cat $(OBJDIR)/versiontag`.tgz" --strip=1 ../src/*.c ../src/*.cpp ../src/*.h ../src/Makefile ../src/Makefile.dep ../src/gfx2.ico ../src/Grafx2_Prefix.pch ../src/SDLMain.m tar cvzf "../src-`cat $(OBJDIR)/versiontag`.tgz" --strip=1 ../src/*.c ../src/*.cpp ../src/*.h ../src/Makefile ../src/Makefile.dep ../src/gfx2.ico ../src/Grafx2_Prefix.pch ../src/SDLMain.m
cd .. && $(ZIP) $(ZIPOPT) "grafx2-`cat $(OBJDIR:../%=%)/versiontag`$(TTFLABEL)-$(PLATFORM).$(ZIP)" $(BIN:../%=%) share/grafx2/gfx2def.ini $(SCRIPT_FILES:../%=%) $(SKIN_FILES:../%=%) share/grafx2/gfx2.gif share/icons/grafx2.svg doc/README.txt doc/COMPILING.txt doc/gpl-2.0.txt doc/PF_fonts.txt $(FONT_FILES:../%=%) doc/README-zlib1.txt doc/README-SDL.txt doc/README-SDL_image.txt doc/README-SDL_ttf.txt doc/README-lua.txt src-`cat $(OBJDIR:../%=%)/versiontag`.tgz $(PLATFORMFILES:../%=%) cd .. && $(ZIP) $(ZIPOPT) "grafx2-`cat $(OBJDIR:../%=%)/versiontag`$(TTFLABEL)-$(PLATFORM).$(ZIP)" $(BIN:../%=%) share/grafx2/gfx2def.ini $(SCRIPT_FILES:../%=%) $(SKIN_FILES:../%=%) share/grafx2/gfx2.gif share/icons/grafx2.svg doc/README.txt doc/COMPILING.txt doc/gpl-2.0.txt doc/PF_fonts.txt $(FONT_FILES:../%=%) doc/README-zlib1.txt doc/README-SDL.txt doc/README-SDL_image.txt doc/README-SDL_ttf.txt doc/README-lua.txt src-`cat $(OBJDIR:../%=%)/versiontag`.tgz $(PLATFORMFILES:../%=%)
$(DELCOMMAND) "../src-`cat $(OBJDIR)/versiontag`.tgz" $(DELCOMMAND) "../src-`cat $(OBJDIR)/versiontag`.tgz"
@ -582,9 +584,9 @@ ifeq ($(PLATFORM),Haiku)
mimeset -f $(BIN) mimeset -f $(BIN)
endif endif
# SVN revision number # GIT revision number
version.c : version.c :
echo "char SVN_revision[]=\"`svnversion .`\";" > version.c echo "char SVN_revision[]=\"$(GIT_REVISION)\";" > version.c
ifeq ($(LABEL),) ifeq ($(LABEL),)
else else
echo "char Program_version[]=\"$(LABEL)\";" > pversion.c echo "char Program_version[]=\"$(LABEL)\";" > pversion.c