Skip to content

Commit 940c879

Browse files
committed
Version script Update
1. Revise version number to 4.0.1 2. Remove obsolete version scripts 3. Change from echo to printf for compatability 4. Update Makefile.in to remove obsolete svn and git variants 5. Update Makefile.in to remove obsolete updateguide
1 parent c01389d commit 940c879

File tree

4 files changed

+7
-57
lines changed

4 files changed

+7
-57
lines changed

Makefile.in

+4-38
Original file line numberDiff line numberDiff line change
@@ -135,51 +135,17 @@ dep depend fastdep: $(DEPEND_FILE)
135135
################################################################################
136136
dev: distclean autotools all
137137

138-
################################################################################
139-
# DEV-GIT, BUILD with developer flags #
140-
################################################################################
141-
dev-git: distclean autotools-git all
142-
143-
144-
################################################################################
145-
# GIT, BUILD with developer flags #
146-
################################################################################
147-
build-commit-git: distclean set-version-git all
148-
149-
################################################################################
150-
# CURRENT, BUILD current svn trunk. #
151-
################################################################################
152-
current: distclean svn autotools all
153-
154-
svn:
155-
svn update
156-
157138
autotools:
158-
@sed -e 's/.\/commit-version.sh/.\/version.sh/g' configure.ac > configure.ac.tmp && mv -f configure.ac.tmp configure.ac
139+
@sed -e 's/.\/version.sh/.\/version.sh/g' configure.ac > configure.ac.tmp && mv -f configure.ac.tmp configure.ac
159140
autoconf
160141
./configure --with-developer-flags
161142

162-
autotools-git:
163-
@sed -e 's/.\/git-commit-version.sh/.\/version.sh/g' configure.ac > configure.ac.tmp && mv -f configure.ac.tmp configure.ac
164-
autoconf
165-
./configure --with-developer-flags
166-
167-
168-
build-commit: distclean svn set-version all
169-
170143
set-version:
171-
@sed -e 's/.\/version.sh/.\/commit-version.sh/g' configure.ac > configure.ac.tmp && mv -f configure.ac.tmp configure.ac
144+
@sed -e 's/.\/version.sh/.\/version.sh/g' configure.ac > configure.ac.tmp && mv -f configure.ac.tmp configure.ac
172145
autoconf
173-
@sed -e 's/.\/commit-version.sh/.\/version.sh/g' configure.ac > configure.ac.tmp && mv -f configure.ac.tmp configure.ac
146+
@sed -e 's/.\/version.sh/.\/version.sh/g' configure.ac > configure.ac.tmp && mv -f configure.ac.tmp configure.ac
174147
./configure --with-developer-flags
175148

176-
set-version-git:
177-
@sed -e 's/.\/version.sh/.\/git-commit-version.sh/g' configure.ac > configure.ac.tmp && mv -f configure.ac.tmp configure.ac
178-
autoconf
179-
@sed -e 's/.\/git-commit-version.sh/.\/version.sh/g' configure.ac > configure.ac.tmp && mv -f configure.ac.tmp configure.ac
180-
./configure --with-developer-flags
181-
182-
183149
help:
184150
@echo "--------------------------------------------------------------------------------"
185151
@echo "make Build motion from local copy in your computer"
@@ -265,7 +231,7 @@ clean: pre-build-info
265231
################################################################################
266232
# DIST restores the directory to distribution state. #
267233
################################################################################
268-
dist: distclean updateguide
234+
dist: distclean
269235
@chmod -R 644 *
270236
@chmod 755 configure
271237
@chmod 755 version.sh

commit-version.sh

-8
This file was deleted.

git-commit-version.sh

-8
This file was deleted.

version.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#!/bin/sh
2-
BASE_VERSION="4.0"
2+
BASE_VERSION="4.0.1"
33
if [ -d .git ]; then
44
GIT_COMMIT=`git show -s --format=%h`
5-
echo -n "$BASE_VERSION+git$GIT_COMMIT"
5+
printf "$BASE_VERSION+git$GIT_COMMIT"
66
else
7-
echo -n "$BASE_VERSION"
7+
printf "$BASE_VERSION+gitUNKNOWN"
88
fi

0 commit comments

Comments
 (0)