summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYves Orton <demerphq@gmail.com>2009-01-04 17:39:25 +0100
committerYves Orton <demerphq@gmail.com>2009-01-04 23:32:40 +0100
commite9be352a567fab443a8c229b10a5050c9cf2d4cf (patch)
treeda1e449d37223edad57b6cc7abbb224511a3b562
parente47d8d23772d4a65059bfb0bda1313426b17055a (diff)
downloadperl-e9be352a567fab443a8c229b10a5050c9cf2d4cf.tar.gz
doesnt quite work yet, but provisional steps towards using miniperl to do the git stuff
-rw-r--r--MANIFEST1
-rw-r--r--Makefile.SH6
-rw-r--r--make_patchnum.sh2
-rw-r--r--stock_git_version.h7
4 files changed, 12 insertions, 4 deletions
diff --git a/MANIFEST b/MANIFEST
index 2faee4fcfa..3a0fae4281 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -3617,6 +3617,7 @@ regnodes.h Description of nodes of RE engine
run.c The interpreter loop
scope.c Scope entry and exit code
scope.h Scope entry and exit header
+stock_git_version.h Empty git_version.h used when there is no miniperl around
sv.c Scalar value code
sv.h Scalar value header
symbian/bld.inf Symbian sample app build config
diff --git a/Makefile.SH b/Makefile.SH
index ad04fe5350..9bf115c661 100644
--- a/Makefile.SH
+++ b/Makefile.SH
@@ -525,7 +525,7 @@ splintfiles = $(c1)
.c.s:
$(CCCMDSRC) -S $*.c
-all: $(FIRSTMAKEFILE) make_patchnum miniperl$(EXE_EXT) miniperl extra.pods $(private) $(unidatafiles) $(public) $(dynamic_ext) $(nonxs_ext) extras.make
+all: $(FIRSTMAKEFILE) miniperl$(EXE_EXT) miniperl make_patchnum extra.pods $(private) $(unidatafiles) $(public) $(dynamic_ext) $(nonxs_ext) extras.make
@echo " ";
@echo " Everything is up to date. Type '$(MAKE) test' to run test suite."
@@ -543,8 +543,8 @@ sperl.i: perl.c $(h)
make_patchnum:
sh $(shellflags) make_patchnum.sh
-git_version.h:
- sh $(shellflags) make_patchnum.sh
+git_version.h: stock_git_version.h
+ cp stock_git_version.h git_version.h
# make sure that we recompile perl.c if the git version changes
perl$(OBJ_EXT): git_version.h
diff --git a/make_patchnum.sh b/make_patchnum.sh
index 9a8982fd97..e770f75e86 100644
--- a/make_patchnum.sh
+++ b/make_patchnum.sh
@@ -74,7 +74,7 @@ new_header=`cat <<EOFTEXT
****************************************************************************/
#define PERL_PATCHNUM $describe
$status
-#define PERL_GIT_UNPUSHED_COMMITS $unpushed_commits
+#define PERL_GIT_UNPUSHED_COMMITS $unpushed_commits
/*leave-this-comment*/
EOFTEXT
`
diff --git a/stock_git_version.h b/stock_git_version.h
new file mode 100644
index 0000000000..8eedbe0056
--- /dev/null
+++ b/stock_git_version.h
@@ -0,0 +1,7 @@
+/***************************************************************************
+* WARNING: git_version.h is automatically generated by make_patchnum.sh
+* DO NOT EDIT DIRECTLY - edit make_patchnum.sh instead
+****************************************************************************/
+#define PERL_PATCHNUM UNKOWN
+#define PERL_GIT_UNCOMMITTED_CHANGES UNKNOWN
+#define PERL_GIT_UNPUSHED_COMMITS /*leave-this-comment*/