From 0be716237d732469f0ff2f77518f9e4153827fd5 Mon Sep 17 00:00:00 2001 From: nobu Date: Fri, 16 Jan 2009 02:51:22 +0000 Subject: * symbian/pre-build (COMSPEC): should not overridden. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@21589 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- symbian/configure.bat | 228 +++++++++++++++++++++++++------------------------- symbian/pre-build | 5 +- 2 files changed, 116 insertions(+), 117 deletions(-) (limited to 'symbian') diff --git a/symbian/configure.bat b/symbian/configure.bat index 06505224be..b5bab97745 100644 --- a/symbian/configure.bat +++ b/symbian/configure.bat @@ -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 diff --git a/symbian/pre-build b/symbian/pre-build index 40d19920f1..0020da2390 100644 --- a/symbian/pre-build +++ b/symbian/pre-build @@ -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 -- cgit v1.2.3