kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* common.mk (-IF-NO-STRING-LITERAL-CONCATENATION-): make description

Browse source 
and copyright literals.

* configure.in: enable to make description and copyright literals if
  string literal concatenation is not available.

* version.c (ruby_description, ruby_copyright): now always constant.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@17601 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2008-06-27 06:05:11 +00:00
parent a702337225
commit e53b516328
6 changed files with 28 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
ChangeLog
View file

@ -1,3 +1,13 @@
Fri Jun 27 15:05:06 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* common.mk (-IF-NO-STRING-LITERAL-CONCATENATION-): make description
and copyright literals.
* configure.in: enable to make description and copyright literals if
string literal concatenation is not available.
* version.c (ruby_description, ruby_copyright): now always constant.
Fri Jun 27 12:28:57 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/un.rb (mkmf): new command to create makefile.

9
common.mk
View file

@ -484,3 +484,12 @@ revision.h.tmp: $(REVISION_FORCE)
@set LC_MESSAGES=C
-@$(SET_LC_MESSAGES) $(VCS) info "$(srcdir)" | \
sed -n "s/.*Rev:/#define RUBY_REVISION/p" > "$@"
-IF-NO-STRING-LITERAL-CONCATENATION-::
@{ \
echo '#include "$@"'; \
echo '#include "ruby.h"'; \
echo '#include "version.h"'; \
echo '%define_RUBY_DESCRIPTION RUBY_DESCRIPTION'; \
echo '%define_RUBY_COPYRIGHT RUBY_COPYRIGHT'; \
} | $(CPP) -I. -I$(srcdir) - | \
sed '/^%/!d;s//#/;s/_/ /;s/" *"//g' >> "$@"

5
configure.in
View file

@ -1849,7 +1849,10 @@ AC_CONFIG_FILES(Makefile, [{
sed '/^MISSING/s/\$U\././g' Makefile
echo; test x"$EXEEXT" = x || echo 'miniruby: miniruby$(EXEEXT)'
test "$RUBY_INSTALL_NAME$EXEEXT" = ruby || echo 'ruby: $(PROGRAM);'
sed ['s/{\$([^(){}]*)[^{}]*}//g'] ${srcdir}/common.mk
if_no_string_literal_concatenation=""
test "$rb_cv_string_literal_concatenation" = yes ||
if_no_string_literal_concatenation=';/^-IF-NO-STRING-LITERAL-CONCATENATION-:/d'
sed ['s/{\$([^(){}]*)[^{}]*}//g'"$if_no_string_literal_concatenation"] ${srcdir}/common.mk
} >> confmk$$.tmp && mv -f confmk$$.tmp Makefile],
[RUBY_INSTALL_NAME=$RUBY_INSTALL_NAME EXEEXT=$EXEEXT])
AC_OUTPUT

2
error.c
View file

@ -29,7 +29,7 @@
#define EXIT_SUCCESS 0
#endif
extern const char *ruby_description;
extern const char ruby_description[];
int ruby_nerrs;

21
version.c
View file

@ -21,13 +21,8 @@ const char ruby_version[] = RUBY_VERSION;
const char ruby_release_date[] = RUBY_RELEASE_DATE;
const char ruby_platform[] = RUBY_PLATFORM;
const int ruby_patchlevel = RUBY_PATCHLEVEL;
#if !NO_STRING_LITERAL_CONCATENATION
const char ruby_description[] = RUBY_DESCRIPTION;
const char ruby_copyright[] = RUBY_COPYRIGHT;
#else
char ruby_description[128];
char ruby_copyright[128];
#endif
void
Init_version()
@ -35,9 +30,6 @@ Init_version()
VALUE v = MKSTR(version);
VALUE d = MKSTR(release_date);
VALUE p = MKSTR(platform);
#if NO_STRING_LITERAL_CONCATENATION
VALUE tmp;
#endif
rb_define_global_const("RUBY_VERSION", v);
rb_define_global_const("RUBY_RELEASE_DATE", d);
@ -47,19 +39,6 @@ Init_version()
rb_define_global_const("RUBY_DESCRIPTION", MKSTR(description));
rb_define_global_const("RUBY_COPYRIGHT", MKSTR(copyright));
#if NO_STRING_LITERAL_CONCATENATION
snprintf(ruby_description, sizeof(ruby_description), "ruby %s (%s %s %d) [%s]",
RUBY_VERSION, RUBY_RELEASE_DATE, RUBY_RELEASE_STR,
RUBY_RELEASE_NUM, RUBY_PLATFORM);
tmp = rb_obj_freeze(rb_str_new2(ruby_description));
rb_define_global_const("RUBY_DESCRIPTION", tmp);
snprintf(ruby_copyright, sizeof(ruby_copyright), "ruby - Copyright (C) %d-%d %s",
RUBY_BIRTH_YEAR, RUBY_RELEASE_YEAR, RUBY_AUTHOR);
tmp = rb_obj_freeze(rb_str_new2(ruby_copyright));
rb_define_global_const("RUBY_COPYRIGHT", tmp);
#endif
/* obsolete constants */
rb_define_global_const("VERSION", v);
rb_define_global_const("RELEASE_DATE", d);

9
version.h
View file

@ -16,13 +16,8 @@ RUBY_EXTERN const char ruby_version[];
RUBY_EXTERN const char ruby_release_date[];
RUBY_EXTERN const char ruby_platform[];
RUBY_EXTERN const int ruby_patchlevel;
#if !NO_STRING_LITERAL_CONCATENATION
RUBY_EXTERN const char ruby_description[];
RUBY_EXTERN const char ruby_copyright[];
#else
RUBY_EXTERN char ruby_description[];
RUBY_EXTERN char ruby_copyright[];
#endif
#endif
#define RUBY_AUTHOR "Yukihiro Matsumoto"
@ -49,14 +44,18 @@ RUBY_EXTERN char ruby_copyright[];
#define RUBY_RELEASE_NUM RUBY_REVISION
#endif
#ifndef RUBY_DESCRIPTION
# define RUBY_DESCRIPTION \
"ruby "RUBY_VERSION \
" ("RUBY_RELEASE_DATE" " \
RUBY_RELEASE_STR" " \
STRINGIZE(RUBY_RELEASE_NUM)") " \
"["RUBY_PLATFORM"]"
#endif
#ifndef RUBY_COPYRIGHT
# define RUBY_COPYRIGHT \
"ruby - Copyright (C) " \
STRINGIZE(RUBY_BIRTH_YEAR)"-" \
STRINGIZE(RUBY_RELEASE_YEAR)" " \
RUBY_AUTHOR
#endif