From f736b6e63ecebdb545c3c7a110705126437d2046 Mon Sep 17 00:00:00 2001 From: Shahram Najm Date: Tue, 26 Mar 2013 16:09:12 +0000 Subject: [PATCH] Remove p4 edit commands; git does not need them --- src/extrules.am | 12 ++++++------ src/grib2c.pl | 1 - src/make_accessor_class_hash.ksh | 2 +- src/make_class.pl | 4 ++-- src/make_hash_keys.ksh | 2 +- 5 files changed, 10 insertions(+), 11 deletions(-) diff --git a/src/extrules.am b/src/extrules.am index 86dba0a6a..f361278ce 100644 --- a/src/extrules.am +++ b/src/extrules.am @@ -3,17 +3,17 @@ grib_errors.c : grib_errors.txt errors.pl ./errors.pl - cmp grib_errors.c grib_errors.c.new || (p4 edit grib_errors.c ; cp grib_errors.c.new grib_errors.c) - cmp grib_api.h grib_api.h.new || (p4 edit grib_api.h ; cp grib_api.h.new grib_api.h) - cmp ../fortran/grib_api_constants.h grib_api_constants.h.new || (p4 edit ../fortran/grib_api_constants.h ; cp grib_api_constants.h.new ../fortran/grib_api_constants.h) - cmp ../python/grib_errors.h grib_errors.h.new || (p4 edit ../python/grib_errors.h ; cp grib_errors.h.new ../python/grib_errors.h) + cmp grib_errors.c grib_errors.c.new || (cp grib_errors.c.new grib_errors.c) + cmp grib_api.h grib_api.h.new || (cp grib_api.h.new grib_api.h) + cmp ../fortran/grib_api_constants.h grib_api_constants.h.new || (cp grib_api_constants.h.new ../fortran/grib_api_constants.h) + cmp ../python/grib_errors.h grib_errors.h.new || (cp grib_errors.h.new ../python/grib_errors.h) -proto:;-p4 edit grib_api_prototypes.h;mkptypes -A $(libgrib_api_a_prototypes) $(libgrib_api_extra_prototypes) > grib_api_prototypes.h +proto:;-chmod +w grib_api_prototypes.h;mkptypes -A $(libgrib_api_a_prototypes) $(libgrib_api_extra_prototypes) > grib_api_prototypes.h test:all;(cd ../tests; make tests) templates: - -p4 edit grib_templates.h + -chmod +wgrib_templates.h ./grib2c.pl ../templates/*.grib grib_lex.c : gribl.l grib_yacc.h diff --git a/src/grib2c.pl b/src/grib2c.pl index 29fd2d1c8..c00ae47da 100755 --- a/src/grib2c.pl +++ b/src/grib2c.pl @@ -13,7 +13,6 @@ use Data::Dumper; my $name; my %entries; -system("p4 edit grib_templates.h"); open(OUT,">grib_templates.h") or "die grib_templates.h: $!"; print OUT "/* This file is automatically generated by $0, do not edit */\n\n"; diff --git a/src/make_accessor_class_hash.ksh b/src/make_accessor_class_hash.ksh index 32c217777..da9edd215 100755 --- a/src/make_accessor_class_hash.ksh +++ b/src/make_accessor_class_hash.ksh @@ -12,7 +12,7 @@ EOF cat grib_accessor_factory_hash_list | sed 's/\/\*/#/g' >> accessor_class_list.gperf -p4 edit grib_accessor_classes_hash.c +# editing grib_accessor_classes_hash.c gperf -W classes -t -G -H grib_accessor_classes_get_id -N grib_accessor_classes_hash -m 1 -j 1 accessor_class_list.gperf | sed s/__inline//g | sed s/inline//g > grib_accessor_classes_hash.c diff --git a/src/make_class.pl b/src/make_class.pl index 820563287..99c871eab 100755 --- a/src/make_class.pl +++ b/src/make_class.pl @@ -72,7 +72,7 @@ foreach $name ( @ARGV ) if(compare_text("$name.tmp",$name)) { print "UPDATING file $name\n"; - system("p4 edit $name") unless(-w $name); + system("chmod +w $name") unless(-w $name); cp($name,"$name.old") or die "cp($name,$name.old): $!"; cp("$name.tmp",$name) or die "cp($name.tmp,$name): $!"; } @@ -211,7 +211,7 @@ EOF if(-f $file) { local $_; - system("p4 edit $file") unless(-w $file); + system("chmmod +w $file") unless(-w $file); open(F,"<$file") or die "$file: $!"; while() diff --git a/src/make_hash_keys.ksh b/src/make_hash_keys.ksh index f9503c43e..0ba46d1aa 100755 --- a/src/make_hash_keys.ksh +++ b/src/make_hash_keys.ksh @@ -7,7 +7,7 @@ cd ../tests cd ../src -p4 edit keys grib_hash_keys.c +# Editing keys grib_hash_keys.c gperf -I -t -G -H hash_keys -N grib_keys_hash_get -m 3 ../tests/keys | sed s/__inline//g | sed s/inline//g > grib_hash_keys.c