Diff of /trunk/buildtools/svnrev/svnrev.pl

OSDN > Find Software > Tera Term

 Browse Subversion Repository



/[ttssh2]/trunk/buildtools/svnrev/svnrev.pl




Diff of /trunk/buildtools/svnrev/svnrev.pl



 Parent Directory

|  Revision Log



|  Patch














revision 10579 by zmatsuo,
Sat Feb  4 15:42:44 2023 UTC




revision 10580 by zmatsuo,
Sun Feb  5 15:34:47 2023 UTC






#

Line 6 
 use POSIX 'strftime';


Line 6 
 use POSIX 'strftime';












6
 
 

















7
 binmode STDOUT, ':encoding(utf8)';
 binmode STDOUT, ':encoding(utf8)';

















8
 
 















9


 my $tt_version_major = 5;


 my $tt_version_major = 0;













10


 my $tt_version_mainor = 0;


 my $tt_version_minor = 0;













11


 my $tt_version_substr = "beta1";


 my $tt_version_substr = "";













12


 my $version = "$tt_version_major.$tt_version_mainor$tt_version_substr";


 my $tt_version_h = "../../teraterm/common/tt-version.h";













13


 


 my $version;















14
 my $svn = "svn";
 my $svn = "svn";

















15
 my $git = "git";
 my $git = "git";

















16
 my $out_header = "svnversion.h";
 my $out_header = "svnversion.h";











#

Line 111 
 sub read_whole_file {


Line 112 
 sub read_whole_file {












112
 sub compare_file {
 sub compare_file {

















113
         my ($f1, $f2) = @_;
         my ($f1, $f2) = @_;

















114
         if (! -f $f1) {
         if (! -f $f1) {














                 print "$f1 not exsit\n";
 













115
                 return 1;
                 return 1;

















116
         }
         }

















117
         if (! -f $f2) {
         if (! -f $f2) {














                 print "$f2 not exsit\n";
 













118
                 return 1;
                 return 1;

















119
         }
         }

















120
         my $t1 = read_whole_file($f1);
         my $t1 = read_whole_file($f1);

















121
         my $t2 = read_whole_file($f2);
         my $t2 = read_whole_file($f2);

















122
         if ($t1 eq $t2) {
         if ($t1 eq $t2) {

















123
                 # return same
                 # return same














                 print "$f1=$f2\n";
 













124
                 return 0;
                 return 0;

















125
         }
         }














         print "$f1 not equal $f2\n";
 













126
         return 1;
         return 1;

















127
 }
 }

















128
 
 











#

Line 186 
 sub write_info_cmake {


Line 183 
 sub write_info_cmake {












183
         close($FD);
         close($FD);

















184
 }
 }

















185
 
 












186
 
 sub read_tt_version_h()







187
 
 {







188
 
         # ヘッダーファイルがない場合







189
 
         if (! -f $tt_version_h) {







190
 
                 printf("no header\n");







191
 
                 $tt_version_major = 0;







192
 
                 $tt_version_minor = 0;







193
 
                 $tt_version_substr = "no_header";







194
 
                 return;







195
 
         }







196
 
 







197
 
         open(my $FH, '<', $tt_version_h) or die "error open $tt_version_h";







198
 
         while (<$FH>) {







199
 
                 if (/#define\s+TT_VERSION_MAJOR\s+(\d+)/) {







200
 
                         $tt_version_major = $1;







201
 
                 }







202
 
                 elsif (/#define\s+TT_VERSION_MINOR\s+(\d+)/) {







203
 
                         $tt_version_minor = $1;







204
 
                 }







205
 
                 elsif (/#define\s+TT_VERSION_SUBSTR\s+\"(.+)\"/) {







206
 
                         $tt_version_substr = $1;







207
 
                 }







208
 
         }







209
 
         close $FH;







210
 
 }







211
 
 







212
 
 &read_tt_version_h();












213
 &search_svn();
 &search_svn();

















214
 &search_git();
 &search_git();

















215
 &read_toolinfo();
 &read_toolinfo();











#

Line 206 
 $git =~ s/\\/\//g;


Line 230 
 $git =~ s/\\/\//g;












230
 $svn =~ s/"//g;
 $svn =~ s/"//g;

















231
 $svn =~ s/\\/\//g;
 $svn =~ s/\\/\//g;

















232
 
 












233
 
 if ($tt_version_substr eq "") {







234
 
         $version = "$tt_version_major.$tt_version_minor";







235
 
 } else {







236
 
         $version = "$tt_version_major.$tt_version_minor-$tt_version_substr";







237
 
 }







238
 
 












239
 if ($verbose != 0) {
 if ($verbose != 0) {

















240
         print "root=$source_root\n";
         print "root=$source_root\n";












241
 
         print "tt_version_major=$tt_version_major\n";







242
 
         print "tt_version_minor=$tt_version_minor\n";







243
 
         print "tt_version_substr=$tt_version_substr\n";












244
         print "svn=\"$svn\"\n";
         print "svn=\"$svn\"\n";

















245
         print "git=\"$git\"\n";
         print "git=\"$git\"\n";

















246
         print "header=\"$out_header\"\n";
         print "header=\"$out_header\"\n";





























Legend:



Removed from v.10579
 


changed lines


 
Added in v.10580













Back to OSDN">Back to OSDN
ViewVC Help


Powered by ViewVC 1.1.26
 /[ttssh2]/trunk/buildtools/svnrev/svnrev.pl
-revision 10579 by zmatsuo,
Sat Feb  4 15:42:44 2023 UTC
+revision 10580 by zmatsuo,
Sun Feb  5 15:34:47 2023 UTC
 Line 6 
 use POSIX 'strftime';
  binmode STDOUT, ':encoding(utf8)';
- my $tt_version_major = 5;
+ my $tt_version_major = 0;
- my $tt_version_mainor = 0;
+ my $tt_version_minor = 0;
- my $tt_version_substr = "beta1";
+ my $tt_version_substr = "";
- my $version = "$tt_version_major.$tt_version_mainor$tt_version_substr";
+ my $tt_version_h = "../../teraterm/common/tt-version.h";
+ my $version;
  my $svn = "svn";
  my $git = "git";
  my $out_header = "svnversion.h";
-Line 111 
 sub read_whole_file {
+Line 112 
 sub read_whole_file {
  sub compare_file {
          my ($f1, $f2) = @_;
          if (! -f $f1) {
-                 print "$f1 not exsit\n";
                  return 1;
          }
          if (! -f $f2) {
-                 print "$f2 not exsit\n";
                  return 1;
          }
          my $t1 = read_whole_file($f1);
          my $t2 = read_whole_file($f2);
          if ($t1 eq $t2) {
                  # return same
-                 print "$f1=$f2\n";
                  return 0;
          }
-         print "$f1 not equal $f2\n";
          return 1;
  }
-Line 186 
 sub write_info_cmake {
+Line 183 
 sub write_info_cmake {
          close($FD);
  }
+ sub read_tt_version_h()
+ {
+         # ヘッダーファイルがない場合
+         if (! -f $tt_version_h) {
+                 printf("no header\n");
+                 $tt_version_major = 0;
+                 $tt_version_minor = 0;
+                 $tt_version_substr = "no_header";
+                 return;
+         }
+         open(my $FH, '<', $tt_version_h) or die "error open $tt_version_h";
+         while (<$FH>) {
+                 if (/#define\s+TT_VERSION_MAJOR\s+(\d+)/) {
+                         $tt_version_major = $1;
+                 }
+                 elsif (/#define\s+TT_VERSION_MINOR\s+(\d+)/) {
+                         $tt_version_minor = $1;
+                 }
+                 elsif (/#define\s+TT_VERSION_SUBSTR\s+\"(.+)\"/) {
+                         $tt_version_substr = $1;
+                 }
+         }
+         close $FH;
+ }
+ &read_tt_version_h();
  &search_svn();
  &search_git();
  &read_toolinfo();
-Line 206 
 $git =~ s/\\/\//g;
+Line 230 
 $git =~ s/\\/\//g;
  $svn =~ s/"//g;
  $svn =~ s/\\/\//g;
+ if ($tt_version_substr eq "") {
+         $version = "$tt_version_major.$tt_version_minor";
+ } else {
+         $version = "$tt_version_major.$tt_version_minor-$tt_version_substr";
+ }
  if ($verbose != 0) {
          print "root=$source_root\n";
+         print "tt_version_major=$tt_version_major\n";
+         print "tt_version_minor=$tt_version_minor\n";
+         print "tt_version_substr=$tt_version_substr\n";
          print "svn=\"$svn\"\n";
          print "git=\"$git\"\n";
          print "header=\"$out_header\"\n";
 Legend:



Removed from v.10579
 


changed lines


 
Added in v.10580
 Legend:



Removed from v.10579
 


changed lines


 
Added in v.10580
-Removed from v.10579
+Added in v.10580
-Back to OSDN">Back to OSDN
+ViewVC Help
 Powered by ViewVC 1.1.26

Develop and Download Open Source Software

Tera Term

Browse Subversion Repository