1 |
robbat2 08/05/28 17:55:36 |
2 |
|
3 |
Added: vim-ftdetect-gitcommit.vim |
4 |
20080528-git-1.5.5.3-noperl.patch |
5 |
Log: |
6 |
Version bump, 1.5.5 series is pretty ready for primetime. |
7 |
(Portage version: 2.1.5.2) |
8 |
|
9 |
Revision Changes Path |
10 |
1.1 dev-util/git/files/vim-ftdetect-gitcommit.vim |
11 |
|
12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/git/files/vim-ftdetect-gitcommit.vim?rev=1.1&view=markup |
13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/git/files/vim-ftdetect-gitcommit.vim?rev=1.1&content-type=text/plain |
14 |
|
15 |
Index: vim-ftdetect-gitcommit.vim |
16 |
=================================================================== |
17 |
" $Header: /var/cvsroot/gentoo-x86/dev-util/git/files/vim-ftdetect-gitcommit.vim,v 1.1 2008/05/28 17:55:35 robbat2 Exp $ |
18 |
" This is what is suggested by the contrib/vim/README that ships with Git |
19 |
autocmd BufNewFile,BufRead COMMIT_EDITMSG set filetype=gitcommit |
20 |
|
21 |
|
22 |
|
23 |
1.1 dev-util/git/files/20080528-git-1.5.5.3-noperl.patch |
24 |
|
25 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/git/files/20080528-git-1.5.5.3-noperl.patch?rev=1.1&view=markup |
26 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/git/files/20080528-git-1.5.5.3-noperl.patch?rev=1.1&content-type=text/plain |
27 |
|
28 |
Index: 20080528-git-1.5.5.3-noperl.patch |
29 |
=================================================================== |
30 |
diff -Nuar --exclude '*.orig' --exclude '*.rej' git-1.5.5.3.orig/builtin-add.c git-1.5.5.3/builtin-add.c |
31 |
--- git-1.5.5.3.orig/builtin-add.c 2008-05-28 00:56:46.000000000 -0700 |
32 |
+++ git-1.5.5.3/builtin-add.c 2008-05-28 10:38:12.566970120 -0700 |
33 |
@@ -135,6 +135,7 @@ |
34 |
free(seen); |
35 |
} |
36 |
|
37 |
+#ifndef NO_PERL |
38 |
static const char **validate_pathspec(int argc, const char **argv, const char *prefix) |
39 |
{ |
40 |
const char **pathspec = get_pathspec(prefix, argv); |
41 |
@@ -170,6 +171,7 @@ |
42 |
free(args); |
43 |
return status; |
44 |
} |
45 |
+#endif |
46 |
|
47 |
static struct lock_file lock_file; |
48 |
|
49 |
@@ -182,8 +184,10 @@ |
50 |
OPT__DRY_RUN(&show_only), |
51 |
OPT__VERBOSE(&verbose), |
52 |
OPT_GROUP(""), |
53 |
+#ifndef NO_PERL |
54 |
OPT_BOOLEAN('i', "interactive", &add_interactive, "interactive picking"), |
55 |
OPT_BOOLEAN('p', "patch", &patch_interactive, "interactive patching"), |
56 |
+#endif |
57 |
OPT_BOOLEAN('f', NULL, &ignored_too, "allow adding otherwise ignored files"), |
58 |
OPT_BOOLEAN('u', NULL, &take_worktree_changes, "update tracked files"), |
59 |
OPT_BOOLEAN( 0 , "refresh", &refresh_only, "don't add, only refresh the index"), |
60 |
@@ -198,10 +202,12 @@ |
61 |
|
62 |
argc = parse_options(argc, argv, builtin_add_options, |
63 |
builtin_add_usage, 0); |
64 |
+#ifndef NO_PERL |
65 |
if (patch_interactive) |
66 |
add_interactive = 1; |
67 |
if (add_interactive) |
68 |
exit(interactive_add(argc, argv, prefix)); |
69 |
+#endif |
70 |
|
71 |
git_config(git_default_config); |
72 |
|
73 |
diff -Nuar --exclude '*.orig' --exclude '*.rej' git-1.5.5.3.orig/builtin-commit.c git-1.5.5.3/builtin-commit.c |
74 |
--- git-1.5.5.3.orig/builtin-commit.c 2008-05-28 00:56:46.000000000 -0700 |
75 |
+++ git-1.5.5.3/builtin-commit.c 2008-05-28 10:38:25.556703720 -0700 |
76 |
@@ -97,7 +97,9 @@ |
77 |
OPT_GROUP("Commit contents options"), |
78 |
OPT_BOOLEAN('a', "all", &all, "commit all changed files"), |
79 |
OPT_BOOLEAN('i', "include", &also, "add specified files to index for commit"), |
80 |
+#ifndef NO_PERL |
81 |
OPT_BOOLEAN(0, "interactive", &interactive, "interactively add files"), |
82 |
+#endif |
83 |
OPT_BOOLEAN('o', "only", &only, "commit only specified files"), |
84 |
OPT_BOOLEAN('n', "no-verify", &no_verify, "bypass pre-commit hook"), |
85 |
OPT_BOOLEAN(0, "amend", &amend, "amend previous commit"), |
86 |
@@ -217,6 +219,7 @@ |
87 |
struct path_list partial; |
88 |
const char **pathspec = NULL; |
89 |
|
90 |
+#ifndef NO_PERL |
91 |
if (interactive) { |
92 |
interactive_add(argc, argv, prefix); |
93 |
if (read_cache() < 0) |
94 |
@@ -224,6 +227,7 @@ |
95 |
commit_style = COMMIT_AS_IS; |
96 |
return get_index_file(); |
97 |
} |
98 |
+#endif |
99 |
|
100 |
if (read_cache() < 0) |
101 |
die("index file corrupt"); |
102 |
diff -Nuar --exclude '*.orig' --exclude '*.rej' git-1.5.5.3.orig/Makefile git-1.5.5.3/Makefile |
103 |
--- git-1.5.5.3.orig/Makefile 2008-05-28 10:38:03.608016000 -0700 |
104 |
+++ git-1.5.5.3/Makefile 2008-05-28 10:38:12.571288044 -0700 |
105 |
@@ -130,6 +130,8 @@ |
106 |
# |
107 |
# Define NO_PERL_MAKEMAKER if you cannot use Makefiles generated by perl's |
108 |
# MakeMaker (e.g. using ActiveState under Cygwin). |
109 |
+ |
110 |
+# Define NO_PERL if you do not want Perl scripts at all. |
111 |
# |
112 |
# Define NO_TCLTK if you do not want Tcl/Tk GUI. |
113 |
# |
114 |
@@ -255,6 +257,8 @@ |
115 |
SCRIPT_SH += git-submodule.sh |
116 |
SCRIPT_SH += git-web--browse.sh |
117 |
|
118 |
+SCRIPTS = $(patsubst %.sh,%,$(SCRIPT_SH)) |
119 |
+ifndef NO_PERL |
120 |
SCRIPT_PERL += git-add--interactive.perl |
121 |
SCRIPT_PERL += git-archimport.perl |
122 |
SCRIPT_PERL += git-cvsexportcommit.perl |
123 |
@@ -263,10 +267,11 @@ |
124 |
SCRIPT_PERL += git-relink.perl |
125 |
SCRIPT_PERL += git-send-email.perl |
126 |
SCRIPT_PERL += git-svn.perl |
127 |
- |
128 |
-SCRIPTS = $(patsubst %.sh,%,$(SCRIPT_SH)) \ |
129 |
- $(patsubst %.perl,%,$(SCRIPT_PERL)) \ |
130 |
- git-instaweb |
131 |
+SCRIPTS += $(patsubst %.perl,%,$(SCRIPT_PERL)) \ |
132 |
+ git-instaweb |
133 |
+else |
134 |
+SCRIPT_PERL = |
135 |
+endif |
136 |
|
137 |
# Empty... |
138 |
EXTRA_PROGRAMS = |
139 |
@@ -315,7 +320,10 @@ |
140 |
ALL_PROGRAMS = $(PROGRAMS) $(SCRIPTS) |
141 |
|
142 |
# what 'all' will build but not install in gitexecdir |
143 |
-OTHER_PROGRAMS = git$X gitweb/gitweb.cgi |
144 |
+OTHER_PROGRAMS = git$X |
145 |
+ifndef NO_PERL |
146 |
+OTHER_PROGRAMS += gitweb/gitweb.cgi |
147 |
+endif |
148 |
|
149 |
# Set paths to tools early so that they can be used for version tests. |
150 |
ifndef SHELL_PATH |
151 |
@@ -716,6 +724,10 @@ |
152 |
endif |
153 |
endif |
154 |
|
155 |
+ifdef NO_PERL |
156 |
+ BASIC_CFLAGS += -DNO_PERL |
157 |
+endif |
158 |
+ |
159 |
ifdef ZLIB_PATH |
160 |
BASIC_CFLAGS += -I$(ZLIB_PATH)/include |
161 |
EXTLIBS += -L$(ZLIB_PATH)/$(lib) $(CC_LD_DYNPATH)$(ZLIB_PATH)/$(lib) |
162 |
@@ -896,6 +908,11 @@ |
163 |
ifeq ($(TCLTK_PATH),) |
164 |
NO_TCLTK=NoThanks |
165 |
endif |
166 |
+ifeq ($(PERL_PATH),) |
167 |
+NO_PERL=NoThanks |
168 |
+export NO_PERL |
169 |
+export NO_PERL_MAKEMAKER |
170 |
+endif |
171 |
|
172 |
QUIET_SUBDIR0 = +$(MAKE) -C # space to separate -C and subdir |
173 |
QUIET_SUBDIR1 = |
174 |
@@ -968,7 +985,9 @@ |
175 |
$(QUIET_SUBDIR0)git-gui $(QUIET_SUBDIR1) all |
176 |
$(QUIET_SUBDIR0)gitk-git $(QUIET_SUBDIR1) all |
177 |
endif |
178 |
+ifndef NO_PERL |
179 |
$(QUIET_SUBDIR0)perl $(QUIET_SUBDIR1) PERL_PATH='$(PERL_PATH_SQ)' prefix='$(prefix_SQ)' all |
180 |
+endif |
181 |
$(QUIET_SUBDIR0)templates $(QUIET_SUBDIR1) |
182 |
|
183 |
strip: $(PROGRAMS) git$X |
184 |
@@ -1007,6 +1026,7 @@ |
185 |
chmod +x $@+ && \ |
186 |
mv $@+ $@ |
187 |
|
188 |
+ifndef NO_PERL |
189 |
$(patsubst %.perl,%,$(SCRIPT_PERL)): perl/perl.mak |
190 |
|
191 |
perl/perl.mak: GIT-CFLAGS perl/Makefile perl/Makefile.PL |
192 |
@@ -1065,6 +1085,7 @@ |
193 |
$@.sh > $@+ && \ |
194 |
chmod +x $@+ && \ |
195 |
mv $@+ $@ |
196 |
+endif # NO_PERL |
197 |
|
198 |
configure: configure.ac |
199 |
$(QUIET_GEN)$(RM) $@ $<+ && \ |
200 |
@@ -1218,7 +1239,9 @@ |
201 |
$(INSTALL) $(ALL_PROGRAMS) '$(DESTDIR_SQ)$(gitexecdir_SQ)' |
202 |
$(INSTALL) git$X '$(DESTDIR_SQ)$(bindir_SQ)' |
203 |
$(MAKE) -C templates DESTDIR='$(DESTDIR_SQ)' install |
204 |
+ifndef NO_PERL |
205 |
$(MAKE) -C perl prefix='$(prefix_SQ)' DESTDIR='$(DESTDIR_SQ)' install |
206 |
+endif |
207 |
ifndef NO_TCLTK |
208 |
$(MAKE) -C gitk-git install |
209 |
$(MAKE) -C git-gui install |
210 |
@@ -1307,9 +1330,11 @@ |
211 |
$(RM) -r $(GIT_TARNAME) .doc-tmp-dir |
212 |
$(RM) $(GIT_TARNAME).tar.gz git-core_$(GIT_VERSION)-*.tar.gz |
213 |
$(RM) $(htmldocs).tar.gz $(manpages).tar.gz |
214 |
- $(RM) gitweb/gitweb.cgi |
215 |
$(MAKE) -C Documentation/ clean |
216 |
+ifndef NO_PERL |
217 |
+ $(RM) gitweb/gitweb.cgi |
218 |
$(MAKE) -C perl clean |
219 |
+endif |
220 |
$(MAKE) -C templates/ clean |
221 |
$(MAKE) -C t/ clean |
222 |
ifndef NO_TCLTK |
223 |
diff -Nuar --exclude '*.orig' --exclude '*.rej' git-1.5.5.3.orig/t/lib-git-svn.sh git-1.5.5.3/t/lib-git-svn.sh |
224 |
--- git-1.5.5.3.orig/t/lib-git-svn.sh 2008-05-28 00:56:46.000000000 -0700 |
225 |
+++ git-1.5.5.3/t/lib-git-svn.sh 2008-05-28 10:38:12.571288044 -0700 |
226 |
@@ -6,6 +6,12 @@ |
227 |
test_done |
228 |
exit |
229 |
fi |
230 |
+if test -n "$NO_PERL" |
231 |
+then |
232 |
+ test_expect_success 'skipping git-svn tests, NO_PERL defined' : |
233 |
+ test_done |
234 |
+ exit |
235 |
+fi |
236 |
|
237 |
GIT_DIR=$PWD/.git |
238 |
GIT_SVN_DIR=$GIT_DIR/svn/git-svn |
239 |
diff -Nuar --exclude '*.orig' --exclude '*.rej' git-1.5.5.3.orig/t/t5505-remote.sh git-1.5.5.3/t/t5505-remote.sh |
240 |
--- git-1.5.5.3.orig/t/t5505-remote.sh 2008-05-28 00:56:46.000000000 -0700 |
241 |
+++ git-1.5.5.3/t/t5505-remote.sh 2008-05-28 10:38:12.571288044 -0700 |
242 |
@@ -3,6 +3,12 @@ |
243 |
test_description='git remote porcelain-ish' |
244 |
|
245 |
. ./test-lib.sh |
246 |
+if test -n "$NO_PERL" |
247 |
+then |
248 |
+ test_expect_success 'skipping git-cvsimport tests, NO_PERL defined' : |
249 |
+ test_done |
250 |
+ exit |
251 |
+fi |
252 |
|
253 |
setup_repository () { |
254 |
mkdir "$1" && ( |
255 |
diff -Nuar --exclude '*.orig' --exclude '*.rej' git-1.5.5.3.orig/t/t7501-commit.sh git-1.5.5.3/t/t7501-commit.sh |
256 |
--- git-1.5.5.3.orig/t/t7501-commit.sh 2008-05-28 00:56:46.000000000 -0700 |
257 |
+++ git-1.5.5.3/t/t7501-commit.sh 2008-05-28 10:38:12.571288044 -0700 |
258 |
@@ -38,7 +38,7 @@ |
259 |
"echo King of the bongo >file && |
260 |
! git-commit -m foo -a file" |
261 |
|
262 |
-test_expect_success \ |
263 |
+[ -z "$NO_PERL" ] && test_expect_success \ |
264 |
"using paths with --interactive" \ |
265 |
"echo bong-o-bong >file && |
266 |
! echo 7 | git-commit -m foo --interactive file" |
267 |
@@ -119,7 +119,7 @@ |
268 |
"echo 'gak' >file && \ |
269 |
git-commit -m 'author' --author 'Rubber Duck <rduck@××××××.org>' -a" |
270 |
|
271 |
-test_expect_success \ |
272 |
+[ -z "$NO_PERL" ] && test_expect_success \ |
273 |
"interactive add" \ |
274 |
"echo 7 | git-commit --interactive | grep 'What now'" |
275 |
|
276 |
diff -Nuar --exclude '*.orig' --exclude '*.rej' git-1.5.5.3.orig/t/t9001-send-email.sh git-1.5.5.3/t/t9001-send-email.sh |
277 |
--- git-1.5.5.3.orig/t/t9001-send-email.sh 2008-05-28 00:56:46.000000000 -0700 |
278 |
+++ git-1.5.5.3/t/t9001-send-email.sh 2008-05-28 10:38:12.571288044 -0700 |
279 |
@@ -2,6 +2,12 @@ |
280 |
|
281 |
test_description='git-send-email' |
282 |
. ./test-lib.sh |
283 |
+if test -n "$NO_PERL" |
284 |
+then |
285 |
+ test_expect_success 'skipping git-send-email tests, NO_PERL defined' : |
286 |
+ test_done |
287 |
+ exit |
288 |
+fi |
289 |
|
290 |
PROG='git send-email' |
291 |
test_expect_success \ |
292 |
diff -Nuar --exclude '*.orig' --exclude '*.rej' git-1.5.5.3.orig/t/t9200-git-cvsexportcommit.sh git-1.5.5.3/t/t9200-git-cvsexportcommit.sh |
293 |
--- git-1.5.5.3.orig/t/t9200-git-cvsexportcommit.sh 2008-05-28 00:56:46.000000000 -0700 |
294 |
+++ git-1.5.5.3/t/t9200-git-cvsexportcommit.sh 2008-05-28 10:38:12.571288044 -0700 |
295 |
@@ -13,6 +13,12 @@ |
296 |
test_done |
297 |
exit |
298 |
fi |
299 |
+if test -n "$NO_PERL" |
300 |
+then |
301 |
+ test_expect_success 'skipping git-cvsexportcommit tests, NO_PERL defined' : |
302 |
+ test_done |
303 |
+ exit |
304 |
+fi |
305 |
|
306 |
CVSROOT=$(pwd)/cvsroot |
307 |
CVSWORK=$(pwd)/cvswork |
308 |
diff -Nuar --exclude '*.orig' --exclude '*.rej' git-1.5.5.3.orig/t/t9400-git-cvsserver-server.sh git-1.5.5.3/t/t9400-git-cvsserver-server.sh |
309 |
--- git-1.5.5.3.orig/t/t9400-git-cvsserver-server.sh 2008-05-28 00:56:46.000000000 -0700 |
310 |
+++ git-1.5.5.3/t/t9400-git-cvsserver-server.sh 2008-05-28 10:38:12.573745493 -0700 |
311 |
@@ -17,6 +17,12 @@ |
312 |
test_done |
313 |
exit |
314 |
fi |
315 |
+if test -n "$NO_PERL" |
316 |
+then |
317 |
+ test_expect_success 'skipping git-cvsserver tests, NO_PERL defined' : |
318 |
+ test_done |
319 |
+ exit |
320 |
+fi |
321 |
perl -e 'use DBI; use DBD::SQLite' >/dev/null 2>&1 || { |
322 |
test_expect_success 'skipping git-cvsserver tests, Perl SQLite interface unavailable' : |
323 |
test_done |
324 |
diff -Nuar --exclude '*.orig' --exclude '*.rej' git-1.5.5.3.orig/t/t9500-gitweb-standalone-no-errors.sh git-1.5.5.3/t/t9500-gitweb-standalone-no-errors.sh |
325 |
--- git-1.5.5.3.orig/t/t9500-gitweb-standalone-no-errors.sh 2008-05-28 00:56:46.000000000 -0700 |
326 |
+++ git-1.5.5.3/t/t9500-gitweb-standalone-no-errors.sh 2008-05-28 10:38:12.573745493 -0700 |
327 |
@@ -67,6 +67,13 @@ |
328 |
} |
329 |
|
330 |
. ./test-lib.sh |
331 |
+if test -n "$NO_PERL" |
332 |
+then |
333 |
+ test_expect_success 'skipping gitweb-standalone-no-errors tests, NO_PERL defined' : |
334 |
+ test_done |
335 |
+ exit |
336 |
+fi |
337 |
+ |
338 |
|
339 |
perl -MEncode -e 'decode_utf8("", Encode::FB_CROAK)' >/dev/null 2>&1 || { |
340 |
test_expect_success 'skipping gitweb tests, perl version is too old' : |
341 |
diff -Nuar --exclude '*.orig' --exclude '*.rej' git-1.5.5.3.orig/t/t9600-cvsimport.sh git-1.5.5.3/t/t9600-cvsimport.sh |
342 |
--- git-1.5.5.3.orig/t/t9600-cvsimport.sh 2008-05-28 00:56:46.000000000 -0700 |
343 |
+++ git-1.5.5.3/t/t9600-cvsimport.sh 2008-05-28 10:38:12.573745493 -0700 |
344 |
@@ -15,6 +15,12 @@ |
345 |
test_done |
346 |
exit |
347 |
fi |
348 |
+if test -n "$NO_PERL" |
349 |
+then |
350 |
+ test_expect_success 'skipping git-cvsimport tests, NO_PERL defined' : |
351 |
+ test_done |
352 |
+ exit |
353 |
+fi |
354 |
|
355 |
cvsps_version=`cvsps -h 2>&1 | sed -ne 's/cvsps version //p'` |
356 |
case "$cvsps_version" in |
357 |
|
358 |
|
359 |
|
360 |
-- |
361 |
gentoo-commits@l.g.o mailing list |