mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* wince/configure.bat, wince/setup.mak: add prefix, extstatic and
rdoc options. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8242 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu
parent
fb707a7704
commit
b54682b7ea
4 changed files with 111 additions and 63 deletions
|
|
@ -1,10 +1,13 @@
|
|||
Sat Apr 2 22:30:01 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||
Sat Apr 2 22:34:51 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||
|
||||
* configure.in (CP, INSTALL): get rid of less portable options.
|
||||
|
||||
* lib/mkmf.rb (configuration, create_makefile): correct configuration
|
||||
variable.
|
||||
|
||||
* wince/configure.bat, wince/setup.mak: add prefix, extstatic and
|
||||
rdoc options.
|
||||
|
||||
Sat Apr 2 16:59:46 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
|
||||
|
||||
* ext/tk/lib/tk.rb: forgot to update RELEASE_DATE
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ srcdir = $(WIN32DIR:/win32=)
|
|||
!else
|
||||
srcdir = $(WIN32DIR)/..
|
||||
!endif
|
||||
!if "$(prefix)" == ""
|
||||
!ifndef prefix
|
||||
prefix = /usr
|
||||
!endif
|
||||
OS = mswin32
|
||||
|
|
@ -23,6 +23,7 @@ MAKEFILE = Makefile
|
|||
!endif
|
||||
ARCH = PROCESSOR_ARCHITECTURE
|
||||
CPU = PROCESSOR_LEVEL
|
||||
CPP = cl -nologo -EP
|
||||
|
||||
all: -prologue- -generic- -epilogue-
|
||||
i386-$(OS): -prologue- -i386- -epilogue-
|
||||
|
|
@ -41,7 +42,7 @@ EXTSTATIC = $(EXTSTATIC)
|
|||
RDOCTARGET = $(RDOCTARGET)
|
||||
!endif
|
||||
<<
|
||||
@cl -nologo -EP -I$(srcdir) -DRUBY_EXTERN="//" <<"Creating $(MAKEFILE)" >> $(MAKEFILE)
|
||||
@$(CPP) -I$(srcdir) -DRUBY_EXTERN="//" <<"Creating $(MAKEFILE)" >> $(MAKEFILE)
|
||||
#include "version.h"
|
||||
MAJOR = RUBY_VERSION_MAJOR
|
||||
MINOR = RUBY_VERSION_MINOR
|
||||
|
|
|
|||
|
|
@ -1,59 +1,96 @@
|
|||
@echo off
|
||||
::: Don't set environment variable in batch file other than autoexec.bat
|
||||
::: to avoid "Out of environment space" problem on Windows 95/98.
|
||||
::: set TMPMAKE=~tmp~.mak
|
||||
|
||||
echo> ~tmp~.mak ####
|
||||
echo>> ~tmp~.mak conf = %0
|
||||
echo>> ~tmp~.mak $(conf:\=/): nul
|
||||
echo>> ~tmp~.mak @del ~tmp~.mak
|
||||
echo>> ~tmp~.mak @-$(MAKE) -l$(MAKEFLAGS) -f $(@D)/setup.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" == "--program-suffix" goto :suffix
|
||||
if "%1" == "--program-name" goto :progname
|
||||
if "%1" == "CC" goto :define
|
||||
if "%1" == "EMBEDDED_TOOLS_DIR" goto :define
|
||||
if "%1" == "CE_TOOLS_DIR" goto :define
|
||||
if "%1" == "EMBEDDED_TOOLS4_DIR" goto :define
|
||||
if "%1" == "CE_TOOLS4_DIR" goto :define
|
||||
echo>> ~tmp~.mak "%1" \
|
||||
shift
|
||||
goto :loop
|
||||
:srcdir
|
||||
echo>> ~tmp~.mak "srcdir=%2" \
|
||||
shift
|
||||
shift
|
||||
goto :loop
|
||||
:suffix
|
||||
echo>> ~tmp~.mak "RUBY_SUFFIX=%2" \
|
||||
shift
|
||||
shift
|
||||
goto :loop
|
||||
:installname
|
||||
echo>> ~tmp~.mak "RUBY_INSTALL_NAME=%2" \
|
||||
shift
|
||||
shift
|
||||
goto :loop
|
||||
:soname
|
||||
echo>> ~tmp~.mak "RUBY_SO_NAME=%2" \
|
||||
shift
|
||||
shift
|
||||
goto :loop
|
||||
:define
|
||||
echo>> ~tmp~.mak "%1=%2" \
|
||||
shift
|
||||
shift
|
||||
goto :loop
|
||||
:target
|
||||
echo>> ~tmp~.mak "%2" \
|
||||
shift
|
||||
shift
|
||||
goto :loop
|
||||
:end
|
||||
echo>> ~tmp~.mak WIN32DIR=$(@D)
|
||||
nmake -alf ~tmp~.mak
|
||||
@echo off
|
||||
::: Don't set environment variable in batch file other than autoexec.bat
|
||||
::: to avoid "Out of environment space" problem on Windows 95/98.
|
||||
::: set TMPMAKE=~tmp~.mak
|
||||
|
||||
echo> ~tmp~.mak ####
|
||||
echo>> ~tmp~.mak conf = %0
|
||||
echo>> ~tmp~.mak $(conf:\=/): nul
|
||||
echo>> ~tmp~.mak @del ~tmp~.mak
|
||||
echo>> ~tmp~.mak @-$(MAKE) -l$(MAKEFLAGS) -f $(@D)/setup.mak \
|
||||
:loop
|
||||
if "%1" == "" goto :end
|
||||
if "%1" == "--prefix" goto :prefix
|
||||
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" == "--program-suffix" goto :suffix
|
||||
if "%1" == "--program-name" goto :progname
|
||||
if "%1" == "--enable-install-doc" goto :enable-rdoc
|
||||
if "%1" == "--disable-install-doc" goto :disable-rdoc
|
||||
if "%1" == "-h" goto :help
|
||||
if "%1" == "--help" goto :help
|
||||
if "%1" == "CC" goto :define
|
||||
if "%1" == "EMBEDDED_TOOLS_DIR" goto :define
|
||||
if "%1" == "CE_TOOLS_DIR" goto :define
|
||||
if "%1" == "EMBEDDED_TOOLS4_DIR" goto :define
|
||||
if "%1" == "CE_TOOLS4_DIR" goto :define
|
||||
echo>> ~tmp~.mak "%1" \
|
||||
shift
|
||||
goto :loop
|
||||
:srcdir
|
||||
echo>> ~tmp~.mak "srcdir=%2" \
|
||||
shift
|
||||
shift
|
||||
goto :loop
|
||||
:prefix
|
||||
echo>> ~tmp~.mak "prefix=%2" \
|
||||
shift
|
||||
shift
|
||||
goto :loop
|
||||
:suffix
|
||||
echo>> ~tmp~.mak "RUBY_SUFFIX=%2" \
|
||||
shift
|
||||
shift
|
||||
goto :loop
|
||||
:installname
|
||||
echo>> ~tmp~.mak "RUBY_INSTALL_NAME=%2" \
|
||||
shift
|
||||
shift
|
||||
goto :loop
|
||||
:soname
|
||||
echo>> ~tmp~.mak "RUBY_SO_NAME=%2" \
|
||||
shift
|
||||
shift
|
||||
goto :loop
|
||||
:define
|
||||
echo>> ~tmp~.mak "%1=%2" \
|
||||
shift
|
||||
shift
|
||||
goto :loop
|
||||
:target
|
||||
echo>> ~tmp~.mak "%2" \
|
||||
shift
|
||||
shift
|
||||
goto :loop
|
||||
:extstatic
|
||||
echo>> ~tmp~.mak "EXTSTATIC=static" \
|
||||
shift
|
||||
goto :loop
|
||||
:enable-rdoc
|
||||
echo>> ~tmp~.mak "RDOCTARGET=install-doc" \
|
||||
shift
|
||||
goto :loop
|
||||
:disable-rdoc
|
||||
echo>> ~tmp~.mak "RDOCTARGET=install-nodoc" \
|
||||
shift
|
||||
goto :loop
|
||||
:help
|
||||
echo Configuration:
|
||||
echo --help display this help
|
||||
echo --srcdir=DIR find the sources in DIR [configure dir or `..']
|
||||
echo Installation directories:
|
||||
echo --prefix=PREFIX install files in PREFIX []
|
||||
echo System types:
|
||||
echo --target=TARGET configure for TARGET [i386-mswin32]
|
||||
echo Optional Package:
|
||||
echo --with-static-linked-ext link external modules statically
|
||||
echo --enable-install-doc install rdoc indexes during install
|
||||
del ~tmp~.mak
|
||||
goto :exit
|
||||
:end
|
||||
echo>> ~tmp~.mak WIN32DIR=$(@D)
|
||||
nmake -alf ~tmp~.mak
|
||||
:exit
|
||||
|
|
|
|||
|
|
@ -9,6 +9,9 @@ srcdir = $(WIN32DIR:/win32=)
|
|||
!else
|
||||
srcdir = $(WIN32DIR)/..
|
||||
!endif
|
||||
!ifndef prefix
|
||||
prefix = /usr
|
||||
!endif
|
||||
OS = mswince
|
||||
RT = msvcrt
|
||||
INCLUDE = !include
|
||||
|
|
@ -47,6 +50,11 @@ armv4i-sig3-wince: -prologue- -armv4i- -sig3- -epilogue-
|
|||
@type << > $(MAKEFILE)
|
||||
### Makefile for ruby $(OS) ###
|
||||
srcdir = $(srcdir:\=/)
|
||||
prefix = $(prefix:\=/)
|
||||
EXTSTATIC = $(EXTSTATIC)
|
||||
!if defined(RDOCTARGET)
|
||||
RDOCTARGET = $(RDOCTARGET)
|
||||
!endif
|
||||
<<
|
||||
@$(CPP) -I$(srcdir) -DRUBY_EXTERN="//" <<"Creating $(MAKEFILE)" >> $(MAKEFILE)
|
||||
#include "version.h"
|
||||
|
|
@ -216,7 +224,6 @@ RUBY_SO_NAME = $(RUBY_SO_NAME)
|
|||
!else
|
||||
# RUBY_SO_NAME = $$(RT)-$$(RUBY_INSTALL_NAME)$$(MAJOR)$$(MINOR)
|
||||
!endif
|
||||
# prefix = /usr
|
||||
# CFLAGS = -nologo $$(DEBUGFLAGS) $$(OPTFLAGS) $$(PROCESSOR_FLAG)
|
||||
CPPFLAGS = -I. -I$$(srcdir) -I$$(srcdir)/missing -I$$(srcdir)/wince \
|
||||
$$(CECPUDEF) -DUNDER_CE -D_WIN32_WCE=$$(SUBSYSVERSION:.=) \
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue