From: Oliver Schmidt Date: Sun, 7 Apr 2013 20:25:49 +0000 (+0200) Subject: No SVN version here. X-Git-Tag: V2.14~72 X-Git-Url: https://git.sur5r.net/?p=cc65;a=commitdiff_plain;h=ef803fed0528a57a9012f384f9b4294ac206f338 No SVN version here. --- diff --git a/src/cc65/main.c b/src/cc65/main.c index 03f06fff5..461d8b95a 100644 --- a/src/cc65/main.c +++ b/src/cc65/main.c @@ -67,7 +67,6 @@ #include "scanner.h" #include "segments.h" #include "standard.h" -#include "svnversion.h" @@ -712,9 +711,7 @@ static void OptVersion (const char* Opt attribute ((unused)), const char* Arg attribute ((unused))) /* Print the compiler version */ { - fprintf (stderr, - "cc65 V%s\nSVN version: %s\n", - GetVersionAsString (), SVNVersion); + fprintf (stderr, "cc65 V%s\n", GetVersionAsString ()); exit (EXIT_SUCCESS); } diff --git a/src/cc65/make/gcc.mak b/src/cc65/make/gcc.mak index 51a0d9cbe..0cd38d151 100644 --- a/src/cc65/make/gcc.mak +++ b/src/cc65/make/gcc.mak @@ -25,19 +25,6 @@ override CFLAGS += -DCC65_INC=$(CC65_INC) EBIND = emxbind LDFLAGS = -lm -# Determine the svn version number if possible -ifneq "$(shell which svnversion 2>/dev/null)" "" -SVNVERSION=$(shell svnversion) -ifeq "$(SVNVERSION)" "exported" -SVNVERSION=unknown -endif -ifeq "$(SVNVERSION)" "Unversioned directory" -SVNVERSION=unknown -endif -else -SVNVERSION=unknown -endif - # ------------------------------------------------------------------------------ # Object files and libraries to link @@ -104,7 +91,6 @@ OBJS = anonname.o \ stdfunc.o \ stdnames.o \ stmt.o \ - svnversion.o \ swstmt.o \ symentry.o \ symtab.o \ @@ -123,7 +109,7 @@ LIBS = $(COMMON)/common.a # Main target - must be first .PHONY: all ifeq (.depend,$(wildcard .depend)) -all: svnversion $(EXE) +all: $(EXE) include .depend else all: depend @@ -134,20 +120,11 @@ $(EXE): $(OBJS) $(LIBS) $(CC) $(LDFLAGS) $(OBJS) $(LIBS) -lm -o $@ @if [ $(OS2_SHELL) ] ; then $(EBIND) $(EXE) ; fi -.PHONY: svnversion -svnversion: - @$(RM) svnversion.c - @echo "/* This file is auto-generated - do not modify! */" >> svnversion.c - @echo "" >> svnversion.c - @echo "const char SVNVersion[] = \"$(SVNVERSION)\";" >> svnversion.c - -svnversion.c: svnversion - clean: $(RM) *~ core.* *.map zap: clean - $(RM) $(OBJS) $(EXE) .depend svnversion.c + $(RM) $(OBJS) $(EXE) .depend # ------------------------------------------------------------------------------ # Make the dependencies @@ -156,6 +133,3 @@ zap: clean depend dep: $(OBJS:.o=.c) @echo "Creating dependency information" $(CC) -I$(COMMON) -MM $^ > .depend - - - diff --git a/src/cc65/svnversion.h b/src/cc65/svnversion.h deleted file mode 100644 index c5ab5e962..000000000 --- a/src/cc65/svnversion.h +++ /dev/null @@ -1,57 +0,0 @@ -/*****************************************************************************/ -/* */ -/* svnversion.h */ -/* */ -/* Keep track of the svn version */ -/* */ -/* */ -/* */ -/* (C) 1998-2008 Ullrich von Bassewitz */ -/* Roemerstrasse 52 */ -/* D-70794 Filderstadt */ -/* EMail: uz@cc65.org */ -/* */ -/* */ -/* This software is provided 'as-is', without any expressed or implied */ -/* warranty. In no event will the authors be held liable for any damages */ -/* arising from the use of this software. */ -/* */ -/* Permission is granted to anyone to use this software for any purpose, */ -/* including commercial applications, and to alter it and redistribute it */ -/* freely, subject to the following restrictions: */ -/* */ -/* 1. The origin of this software must not be misrepresented; you must not */ -/* claim that you wrote the original software. If you use this software */ -/* in a product, an acknowledgment in the product documentation would be */ -/* appreciated but is not required. */ -/* 2. Altered source versions must be plainly marked as such, and must not */ -/* be misrepresented as being the original software. */ -/* 3. This notice may not be removed or altered from any source */ -/* distribution. */ -/* */ -/*****************************************************************************/ - - - -#ifndef SVNVERSION_H -#define SVNVERSION_H - - - -/*****************************************************************************/ -/* Data */ -/*****************************************************************************/ - - - -/* This variable contains the SVN version string */ -extern const char SVNVersion[]; - - - -/* End of svnversion.h */ - -#endif - - -