← Back to branch summary

~ubuntu-branches/ubuntu/quantal/ruby1.9.1/quantal

« back to all changes in this revision

Viewing changes to win32/configure.bat

  • Committer: Bazaar Package Importer
  • Author(s): Lucas Nussbaum
  • Date: 2010-07-31 17:08:39 UTC
  • mfrom: (1.1.4 upstream) (8.1.2 sid)
  • Revision ID: james.westby@ubuntu.com-20100731170839-j034dmpdqt1cc4p6
Tags: 1.9.2~svn28788-1
http://bugs.debian.org/580852
http://bugs.debian.org/590002
http://bugs.debian.org/543805
http://bugs.debian.org/542927
* New release based on upstream snapshot from the 1.9.2 branch,
  after 1.9.2 RC2. That branch is (supposed to be) binary-compatible
  with the 1.9.1 branch.
  + Builds fine on i386. Closes: #580852.
* Upgrade to Standards-Version: 3.9.1. No changes needed.
* Updated generated incs.
* Patches that still need work:
  + Unclear status, need more investigation:
   090729_fix_Makefile_deps.dpatch
   090803_exclude_rdoc.dpatch
   203_adjust_base_of_search_path.dpatch
   902_define_YAML_in_yaml_stringio.rb.dpatch
   919_common.mk_tweaks.dpatch
   931_libruby_suffix.dpatch
   940_test_thread_mutex_sync_shorter.dpatch
  + Maybe not needed anymore, keeping but not applying.
   102_skip_test_copy_stream.dpatch (test doesn't block anymore?)
   104_skip_btest_io.dpatch (test doesn't block anymore?)
   201_gem_prelude.dpatch (we don't use that rubygems anyway?)
   202_gem_default_dir.dpatch (we don't use that rubygems anyway?)
   940_test_file_exhaustive_fails_as_root.dpatch
   940_test_priority_fails.dpatch
   100518_load_libc_libm.dpatch
* Add disable-tests.diff: disable some tests that cause failures on FreeBSD.
  Closes: #590002, #543805, #542927.
* However, many new failures on FreeBSD. Since that version is still an
  improvement, add the check that makes test suite failures non-fatal on
  FreeBSD again. That still needs to be investigated.
* Re-add 903_skip_base_ruby_check.dpatch
* Add build-dependency on ruby1.8 and drop all pre-generated files.

Show diffs side-by-side

added added

removed removed

Lines of Context:
win32/configure.bat
5
5
 
6
6
echo> ~tmp~.mak ####
7
7
echo>> ~tmp~.mak conf = %0
8
 
echo>> ~tmp~.mak $(conf:\=/): nul
 
8
echo>> ~tmp~.mak $(conf): nul
9
9
echo>> ~tmp~.mak        @del ~setup~.mak
10
10
echo>> ~tmp~.mak        @-$(MAKE) -l$(MAKEFLAGS) -f $(@D)/setup.mak \
11
11
if exist pathlist.tmp del pathlist.tmp
25
25
if "%1" == "--so-name" goto :soname
26
26
if "%1" == "--enable-install-doc" goto :enable-rdoc
27
27
if "%1" == "--disable-install-doc" goto :disable-rdoc
 
28
if "%1" == "--enable-win95" goto :enable-win95
 
29
if "%1" == "--disable-win95" goto :disable-win95
28
30
if "%1" == "--extout" goto :extout
29
31
if "%1" == "--path" goto :path
30
32
if "%1" == "--with-baseruby" goto :baseruby
 
33
if "%1" == "--with-ntver" goto :ntver
 
34
echo %1| findstr "^--with-.*-dir$" > nul
 
35
if not errorlevel 1 goto :withdir
 
36
echo %1| findstr "^--with-.*-include$" > nul
 
37
if not errorlevel 1 goto :withdir
 
38
echo %1| findstr "^--with-.*-lib$" > nul
 
39
if not errorlevel 1 goto :withdir
31
40
if "%1" == "-h" goto :help
32
41
if "%1" == "--help" goto :help
33
42
  echo>>confargs.tmp %1 \
86
95
  shift
87
96
goto :loop
88
97
:enable-rdoc
89
 
  echo>> ~tmp~.mak      "RDOCTARGET=install-doc" \
 
98
  echo>> ~tmp~.mak      "RDOCTARGET=rdoc" \
90
99
  echo>>confargs.tmp %1 \
91
100
  shift
92
101
goto :loop
93
102
:disable-rdoc
94
 
  echo>> ~tmp~.mak      "RDOCTARGET=install-nodoc" \
95
 
  echo>>confargs.tmp %1 \
 
103
  echo>> ~tmp~.mak      "RDOCTARGET=nodoc" \
 
104
  echo>>confargs.tmp %1 \
 
105
  shift
 
106
goto :loop
 
107
:enable-win95
 
108
  echo>> ~tmp~.mak      "ENABLE_WIN95=yes" \
 
109
  echo>>confargs.tmp %1 \
 
110
  shift
 
111
goto :loop
 
112
:disable-win95
 
113
  echo>> ~tmp~.mak      "ENABLE_WIN95=no" \
 
114
  echo>>confargs.tmp %1 \
 
115
  shift
 
116
goto :loop
 
117
:ntver
 
118
  echo>> ~tmp~.mak      "NTVER=%2" \
 
119
  echo>>confargs.tmp %1=%2 \
 
120
  shift
96
121
  shift
97
122
goto :loop
98
123
:extout
113
138
  shift
114
139
  shift
115
140
goto :loop
 
141
:withdir
 
142
  echo>>confargs.tmp %1=%2 \
 
143
  shift
 
144
  shift
 
145
goto :loop
116
146
:help
117
147
  echo Configuration:
118
148
  echo   --help                  display this help
125
155
  echo   --with-baseruby=RUBY    use RUBY as baseruby [ruby]
126
156
  echo   --with-static-linked-ext link external modules statically
127
157
  echo   --disable-install-doc   do not install rdoc indexes during install
 
158
  echo   --disable-win95         disable win95 support
 
159
  echo   --with-ntver=0xXXXX     target NT version (shouldn't use with old SDK)
128
160
  del *.tmp
129
161
  del ~tmp~.mak
130
162
goto :exit
131
163
:end
132
 
echo>> ~tmp~.mak        WIN32DIR=$(@D)
 
164
echo>> ~tmp~.mak        WIN32DIR=$(@D:\=/)
133
165
echo.>>confargs.tmp
134
166
echo>confargs.c #define $ $$ 
 
167
echo>>confargs.c !ifndef CONFIGURE_ARGS
135
168
type>>confargs.c confargs.tmp
136
169
echo>>confargs.c configure_args = CONFIGURE_ARGS
 
170
echo>>confargs.c !endif
137
171
echo>>confargs.c #undef $
138
172
if exist pathlist.tmp echo>>confargs.c #define PATH_LIST \
139
173
if exist pathlist.tmp type>>confargs.c pathlist.tmp
146
180
type>>~setup~.mak ~tmp~.mak
147
181
del *.tmp > nul
148
182
del ~tmp~.mak > nul
149
 
nmake -alf ~setup~.mak
 
183
echo>>~setup~.mak       @if exist Makefile.old del Makefile.old
 
184
echo>>~setup~.mak       @if exist Makefile ren Makefile Makefile.old
 
185
echo>>~setup~.mak       @ren Makefile.new Makefile
 
186
nmake -alf ~setup~.mak MAKEFILE=Makefile.new
150
187
:exit