[前][次][番号順一覧][スレッド一覧]

ruby-changes:10046

From: nobu <ko1@a...>
Date: Fri, 16 Jan 2009 11:53:23 +0900 (JST)
Subject: [ruby-changes:10046] Ruby:r21589 (trunk): * symbian/pre-build (COMSPEC): should not overridden.

nobu	2009-01-16 11:51:22 +0900 (Fri, 16 Jan 2009)

  New Revision: 21589

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=21589

  Log:
    * symbian/pre-build (COMSPEC): should not overridden.

  Modified files:
    trunk/ChangeLog
    trunk/symbian/README.SYMBIAN
    trunk/symbian/configure.bat
    trunk/symbian/missing-aeabi.c
    trunk/symbian/missing-pips.c
    trunk/symbian/pre-build
    trunk/symbian/rubyu.def
    trunk/symbian/setup

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 21588)
+++ ChangeLog	(revision 21589)
@@ -1,3 +1,7 @@
+Fri Jan 16 11:51:20 2009  Nobuyoshi Nakada  <nobu@r...>
+
+	* symbian/pre-build (COMSPEC): should not overridden.
+
 Fri Jan 16 11:47:56 2009  Nobuyoshi Nakada  <nobu@r...>
 
 	* parse.y (rb_parse_in_main): fixed typo.

Property changes on: symbian/setup
___________________________________________________________________
Name: svn:eol-style
   + LF


Property changes on: symbian/missing-pips.c
___________________________________________________________________
Name: svn:eol-style
   + LF

Index: symbian/pre-build
===================================================================
--- symbian/pre-build	(revision 21588)
+++ symbian/pre-build	(revision 21589)
@@ -1,8 +1,7 @@
 YACC = bison
-COMSPEC=cmd /C
-IFCHANGE = $(COMSPEC) $(srcdir)\win32\ifchange.bat
+IFCHANGE = $(COMSPEC) /c $(srcdir)\win32\ifchange.bat
 RM = del
-MV = $(COMSPEC) move
+MV = $(COMSPEC) /c move
 VCS=svn
 
 

Property changes on: symbian/pre-build
___________________________________________________________________
Name: svn:eol-style
   + LF


Property changes on: symbian/rubyu.def
___________________________________________________________________
Name: svn:eol-style
   + LF

Index: symbian/configure.bat
===================================================================
--- symbian/configure.bat	(revision 21588)
+++ symbian/configure.bat	(revision 21589)
@@ -1,114 +1,114 @@
-@echo off
-
-setlocal
-
-echo> ~tmp~.mak ####
-echo> ~ver~.mak ####
-
-:loop
-if "%1" == "" goto :end
-if "%1" == "--srcdir" goto :srcdir
-if "%1" == "srcdir" goto :srcdir
-if "%1" == "--target" goto :target
-if "%1" == "target" goto :target
-if "%1" == "--with-static-linked-ext" goto :extstatic
-if "%1" == "--extout" goto :extout
-if "%1" == "--with-baseruby" goto :baseruby
-if "%1" == "-h" goto :help
-if "%1" == "--help" goto :help
-  shift
-goto :loop
-:srcdir
-  echo>> ~tmp~.mak srcdir=%2
-  echo> ~ver~.mak srcdir=%2
-  set srcdir=%2
-  shift
-  shift
-goto :loop
-:target
-  echo>> ~tmp~.mak arch=%2
-  set arch=%2
-  shift
-  shift
-goto :loop
-:extstatic
-  echo>> ~tmp~.mak 	EXTSTATIC=static
-  shift
-goto :loop
-:extout
-  echo>> ~tmp~.mak 	EXTOUT=%2
-  set EXTOUT=%2
-  shift
-  shift
-goto :loop
-:baseruby
-  echo>> ~tmp~.mak 	BASERUBY=%2
-  set BASERUBY=%2
-  shift
-  shift
-goto :loop
-:help
-  echo Configuration:
-  echo   --help                    display this help
-  echo   --srcdir=DIR              find the sources in DIR [configure dir or ..']
-  echo System types:
-  echo   --target=TARGET           configure for TARGET [arm-symbianelf]
-  echo Optional Package:
-  echo   --with-baseruby=RUBY      use RUBY as baseruby [ruby]
-  echo   --with-static-linked-ext  link external modules statically
-  del ~tmp~.mak > nul
-goto :exit
-:end
-
-echo>> ~ver~.mak CC = arm-none-symbianelf-gcc
-echo>> ~ver~.mak CPP = $(CC) -E
-if "%srcdir%" == "" echo>> ~ver~.mak srcdir=..
-echo>> ~ver~.mak all:
-echo>> ~ver~.mak ^	@echo^>  ~tmp~.c #define RUBY_REVISION 0
-echo>> ~ver~.mak ^	@echo^>^> ~tmp~.c #include "version.h"
-echo>> ~ver~.mak ^	@echo^>^> ~tmp~.c MAJOR = RUBY_VERSION_MAJOR
-echo>> ~ver~.mak ^	@echo^>^> ~tmp~.c MINOR = RUBY_VERSION_MINOR
-echo>> ~ver~.mak ^	@echo^>^> ~tmp~.c TEENY = RUBY_VERSION_TEENY
-echo>> ~ver~.mak ^	@$(CPP) -I$(srcdir) ~tmp~.c ^| find "=" ^>^>~tmp~.mak
-echo>> ~ver~.mak ^	@del /Q ~tmp~.c
-
-make -f ~ver~.mak
-del /Q ~ver~.mak
-
-:: Defaults
-if "%srcdir%" == "" echo>> ~tmp~.mak srcdir=..
-if "%arch%" == "" echo>> ~tmp~.mak arch=arm-symbianelf
-if "%EXTOUT%" == "" echo>> ~tmp~.mak EXTOUT=$(srcdir)/.ext
-if "%BASERUBY%" == "" echo>> ~tmp~.mak BASERUBY=ruby
-::
-
-echo>> ~tmp~.mak arch_hdrdir = $(EXTOUT)/include/$(arch)
-echo>> ~tmp~.mak hdrdir = $(srcdir)/include
-
-echo>> ~tmp~.mak ifndef EXTSTATIC
-echo>> ~tmp~.mak EXT_LIST=stringio bigdecimal
-echo>> ~tmp~.mak endif
-
-echo>> ~tmp~.mak all:
-echo>> ~tmp~.mak ^	@if not exist $(subst /,\,$(arch_hdrdir))\ruby\nul md $(subst /,\,$(arch_hdrdir)\ruby)
-echo>> ~tmp~.mak ^	$(call config_h,$(subst /,\,$(arch_hdrdir))\ruby\config.h)
-echo>> ~tmp~.mak ^	$(call ruby_mmp,ruby.mmp,64000,2000000,16000000)
-echo>> ~tmp~.mak ifndef EXTSTATIC
-echo>> ~tmp~.mak ^	$(call ext_mmp,stringio,$(STRINGIO_UID))
-echo>> ~tmp~.mak ^	$(call ext_def,stringio)
-echo>> ~tmp~.mak ^	$(call ext_pkg,stringio,$(STRINGIO_UID))
-echo>> ~tmp~.mak ^	$(call ext_mmp,bigdecimal,$(BIGDECIMAL_UID),,libm.lib)
-echo>> ~tmp~.mak ^	$(call ext_def,bigdecimal)
-echo>> ~tmp~.mak ^	$(call ext_pkg,bigdecimal,$(BIGDECIMAL_UID))
-echo>> ~tmp~.mak ^	$(ext_bigdecimal_pkg_lib_append)
-echo>> ~tmp~.mak endif
-echo>> ~tmp~.mak ^	$(call pre_build_mk,pre-build.mk)
-echo>> ~tmp~.mak ^	$(call bld_inf,bld.inf)
-echo>> ~tmp~.mak ^	$(call ruby_pkg,ruby.pkg)
-
-echo>> ~tmp~.mak include setup
-
-make -f ~tmp~.mak
-del /Q ~tmp~.mak
-
-:exit
+@echo off
+
+setlocal
+
+echo> ~tmp~.mak ####
+echo> ~ver~.mak ####
+
+:loop
+if "%1" == "" goto :end
+if "%1" == "--srcdir" goto :srcdir
+if "%1" == "srcdir" goto :srcdir
+if "%1" == "--target" goto :target
+if "%1" == "target" goto :target
+if "%1" == "--with-static-linked-ext" goto :extstatic
+if "%1" == "--extout" goto :extout
+if "%1" == "--with-baseruby" goto :baseruby
+if "%1" == "-h" goto :help
+if "%1" == "--help" goto :help
+  shift
+goto :loop
+:srcdir
+  echo>> ~tmp~.mak srcdir=%2
+  echo> ~ver~.mak srcdir=%2
+  set srcdir=%2
+  shift
+  shift
+goto :loop
+:target
+  echo>> ~tmp~.mak arch=%2
+  set arch=%2
+  shift
+  shift
+goto :loop
+:extstatic
+  echo>> ~tmp~.mak 	EXTSTATIC=static
+  shift
+goto :loop
+:extout
+  echo>> ~tmp~.mak 	EXTOUT=%2
+  set EXTOUT=%2
+  shift
+  shift
+goto :loop
+:baseruby
+  echo>> ~tmp~.mak 	BASERUBY=%2
+  set BASERUBY=%2
+  shift
+  shift
+goto :loop
+:help
+  echo Configuration:
+  echo   --help                    display this help
+  echo   --srcdir=DIR              find the sources in DIR [configure dir or ..']
+  echo System types:
+  echo   --target=TARGET           configure for TARGET [arm-symbianelf]
+  echo Optional Package:
+  echo   --with-baseruby=RUBY      use RUBY as baseruby [ruby]
+  echo   --with-static-linked-ext  link external modules statically
+  del ~tmp~.mak > nul
+goto :exit
+:end
+
+echo>> ~ver~.mak CC = arm-none-symbianelf-gcc
+echo>> ~ver~.mak CPP = $(CC) -E
+if "%srcdir%" == "" echo>> ~ver~.mak srcdir=..
+echo>> ~ver~.mak all:
+echo>> ~ver~.mak ^	@echo^>  ~tmp~.c #define RUBY_REVISION 0
+echo>> ~ver~.mak ^	@echo^>^> ~tmp~.c #include "version.h"
+echo>> ~ver~.mak ^	@echo^>^> ~tmp~.c MAJOR = RUBY_VERSION_MAJOR
+echo>> ~ver~.mak ^	@echo^>^> ~tmp~.c MINOR = RUBY_VERSION_MINOR
+echo>> ~ver~.mak ^	@echo^>^> ~tmp~.c TEENY = RUBY_VERSION_TEENY
+echo>> ~ver~.mak ^	@$(CPP) -I$(srcdir) ~tmp~.c ^| find "=" ^>^>~tmp~.mak
+echo>> ~ver~.mak ^	@del /Q ~tmp~.c
+
+make -f ~ver~.mak
+del /Q ~ver~.mak
+
+:: Defaults
+if "%srcdir%" == "" echo>> ~tmp~.mak srcdir=..
+if "%arch%" == "" echo>> ~tmp~.mak arch=arm-symbianelf
+if "%EXTOUT%" == "" echo>> ~tmp~.mak EXTOUT=$(srcdir)/.ext
+if "%BASERUBY%" == "" echo>> ~tmp~.mak BASERUBY=ruby
+::
+
+echo>> ~tmp~.mak arch_hdrdir = $(EXTOUT)/include/$(arch)
+echo>> ~tmp~.mak hdrdir = $(srcdir)/include
+
+echo>> ~tmp~.mak ifndef EXTSTATIC
+echo>> ~tmp~.mak EXT_LIST=stringio bigdecimal
+echo>> ~tmp~.mak endif
+
+echo>> ~tmp~.mak all:
+echo>> ~tmp~.mak ^	@if not exist $(subst /,\,$(arch_hdrdir))\ruby\nul md $(subst /,\,$(arch_hdrdir)\ruby)
+echo>> ~tmp~.mak ^	$(call config_h,$(subst /,\,$(arch_hdrdir))\ruby\config.h)
+echo>> ~tmp~.mak ^	$(call ruby_mmp,ruby.mmp,64000,2000000,16000000)
+echo>> ~tmp~.mak ifndef EXTSTATIC
+echo>> ~tmp~.mak ^	$(call ext_mmp,stringio,$(STRINGIO_UID))
+echo>> ~tmp~.mak ^	$(call ext_def,stringio)
+echo>> ~tmp~.mak ^	$(call ext_pkg,stringio,$(STRINGIO_UID))
+echo>> ~tmp~.mak ^	$(call ext_mmp,bigdecimal,$(BIGDECIMAL_UID),,libm.lib)
+echo>> ~tmp~.mak ^	$(call ext_def,bigdecimal)
+echo>> ~tmp~.mak ^	$(call ext_pkg,bigdecimal,$(BIGDECIMAL_UID))
+echo>> ~tmp~.mak ^	$(ext_bigdecimal_pkg_lib_append)
+echo>> ~tmp~.mak endif
+echo>> ~tmp~.mak ^	$(call pre_build_mk,pre-build.mk)
+echo>> ~tmp~.mak ^	$(call bld_inf,bld.inf)
+echo>> ~tmp~.mak ^	$(call ruby_pkg,ruby.pkg)
+
+echo>> ~tmp~.mak include setup
+
+make -f ~tmp~.mak
+del /Q ~tmp~.mak
+
+:exit

Property changes on: symbian/configure.bat
___________________________________________________________________
Name: svn:eol-style
   + CRLF


Property changes on: symbian/missing-aeabi.c
___________________________________________________________________
Name: svn:eol-style
   + LF


Property changes on: symbian/README.SYMBIAN
___________________________________________________________________
Name: svn:eol-style
   + LF


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]