mirror of
https://github.com/BepInEx/mono.git
synced 2026-11-17 11:21:39 -10:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
39c87c56fb | ||
|
|
4e4824afab |
No files matched your search
@@ -1,131 +1,3 @@
|
||||
2004-06-24 Raja R Harinath <[email protected]>
|
||||
|
||||
* runtime/net_2_0/Makefile.am (gac_assemblies_list): Put back
|
||||
ICSharpCode.SharpZipLib, not that it has a different version.
|
||||
|
||||
2004-06-24 Raja R Harinath <[email protected]>
|
||||
|
||||
* Makefile.am (MCS_DIRS, MCS_FILES): Add back Mono.CSharp.Debugger.
|
||||
(tmpinst-dir-contents, $(tmpinst)/bin/mono.bat): Remove mono.bat
|
||||
in W32. Use 'mono' and 'mcs' in W32 too.
|
||||
(bootstrap) [PLATFORM_WIN32]: Back to single stage bootstrap.
|
||||
* runtime/net_2_0/Makefile.am (gac_assemblies_list): Don't mention
|
||||
nunit.*, IBM.Data.DB2, ICSharpCode.SharpZipLib.
|
||||
Fix for #60443, the GAC .DLL-Hell.
|
||||
|
||||
2004-06-22 Raja R Harinath <[email protected]>
|
||||
|
||||
* Makefile.am (bootstrap) [PLATFORM_WIN32]: Make two-stage.
|
||||
|
||||
2004-06-18 Jackson Harper <[email protected]>
|
||||
|
||||
* man/mono.1: Add MONO_LOG_LEVEL and MONO_LOG_MASK. Add
|
||||
instructions on setting multiple mask values.
|
||||
|
||||
Fri Jun 18 19:39:09 CEST 2004 Paolo Molaro <[email protected]>
|
||||
|
||||
* Makefile.am: process data before runtime, so the config file is
|
||||
installed and gacutil has a chance to work (finding symlink).
|
||||
|
||||
2004-06-18 Raja R Harinath <[email protected]>
|
||||
|
||||
* runtime/Makefile.am ($(monoone_DATA) $(monotwo_DATA) $(monobins_DATA)):
|
||||
Test if files exist in the mcs/ tree before creating symlinks.
|
||||
Remove symlinks before creating them again.
|
||||
* runtime/net_1_1/Makefile.am (mscorlib.dll $(gac_assemblies)): Likewise.
|
||||
* runtime/net_2_0/Makefile.am (mscorlib.dll $(gac_assemblies)): Likewise.
|
||||
|
||||
2004-06-18 Raja R Harinath <[email protected]>
|
||||
|
||||
* scripts/Makefile.am (REWRITE): New. Common rewriting 'sed' command.
|
||||
(bin_SCRIPTS): Unify all the script generating rules into one.
|
||||
|
||||
2004-06-16 Raja R Harinath <[email protected]>
|
||||
|
||||
* Makefile.am (bootstrap) [PLATFORM_WIN32]: Open code. Don't
|
||||
build and populate net_2_0 profile.
|
||||
(populate-runtime-subdir): Make into subroutine that takes list of
|
||||
profiles to populate.
|
||||
(faststrap): Update.
|
||||
(MCS_DIRS, MCS_FILES, MONO_CSHARP_DEBUGGER_DIR, MONO_CSHARP_DEBUGGER_FILE):
|
||||
Avoid automake conditional/+= problems.
|
||||
(populate-runtime-subdir): Rewrite sanity check.
|
||||
|
||||
2004-06-16 Raja R Harinath <[email protected]>
|
||||
|
||||
Include prototype completely-untested 'make bootstrap' support for W32.
|
||||
* Makefile.am (bootstrap): Define to fasterstrap for W32.
|
||||
(MCS_DIRS, MCS_FILES): Don't refer to Mono.CSharp.Debugger in W32.
|
||||
(tmpinst-dir): Change sub-make invoke to ...
|
||||
(tmpinst-dir-contents): ... this. Build 'mono.bat' in W32 instead
|
||||
of 'mono' and 'mcs'.
|
||||
($(tmpinst)/bin/mono.bat): New.
|
||||
|
||||
2004-06-15 Dick Porter <[email protected]>
|
||||
|
||||
* configure.in: Check for struct ip_mreqn and struct ip_mreq on
|
||||
windows too. Fixes bug 55040.
|
||||
|
||||
Mon Jun 14 18:38:34 CEST 2004 Paolo Molaro <[email protected]>
|
||||
|
||||
* configure.in: better explain that --with-nptl is not related to
|
||||
NPTL, but to __thread support. Set sigaltstack support to off by
|
||||
default.
|
||||
|
||||
2004-06-12 Raja R Harinath <[email protected]>
|
||||
|
||||
* Makefile.am (populate-runtime-subdir): Add _tmpinst directory
|
||||
to the PATH.
|
||||
|
||||
2004-06-11 Jackson Harper <[email protected]>
|
||||
|
||||
* runtime/net_2_0/Makefile.am:
|
||||
* runtime/net_1_1/Makefile.am: Remove signing patches
|
||||
|
||||
2004-06-11 Jackson Harper <[email protected]>
|
||||
|
||||
* man/mono.1: Add documentation for MONO_GAC_PREFIX.
|
||||
* runtime/net_2_0/Makefile.am:
|
||||
* runtime/net_1_1/Makefile.am: Sign assemblies before
|
||||
installing. Do not sign ziplib, npgsql, or nunit assemblies. Sign mscorlib.
|
||||
|
||||
2004-06-11 Raja R Harinath <[email protected]>
|
||||
|
||||
* Makefile.am (populate-runtime-subdir): New target. Does a
|
||||
controlled "make install" in the 'mcs/' directory to populate the
|
||||
'runtime' directory.
|
||||
(fasterstrap): Use it.
|
||||
|
||||
2004-06-10 Raja R Harinath <[email protected]>
|
||||
|
||||
* runtime/Makefile.am ($(monoone_DATA),$(monotwo_DATA),$(monobins_DATA)):
|
||||
Don't copy from prefix. Use $(LN_S) to point to the mcs/ tree.
|
||||
* runtime/net_1_1/Makefile.am (mscorlib.dll,$(gac_assemblies)):
|
||||
Use $(LN_S) to point to the mcs/ tree, rather than copying.
|
||||
* runtime/net_2_0/Makefile.am (mscorlib.dll,$(gac_assemblies)): Likewise.
|
||||
|
||||
2004-06-10 Raja R Harinath <[email protected]>
|
||||
|
||||
Support the new assembly signing setup in mcs/.
|
||||
* Makefile.am (mcs-do-basic-build): Pass 'USE_BOOT_COMPILE' to sub-makes.
|
||||
($(tmpinst)/etc/mono/machine.config): New target.
|
||||
(tmpinst-dir.stamp): Remove and rewrite into ...
|
||||
($(tmpinst)/bin/mcs): ... this and ...
|
||||
($(tmpinst)/bin/mono): ... this. Update to use the in-tree machine.config.
|
||||
(tmpinst-dir): Rewrite to invoke above $(tmpinst)/... targets directly.
|
||||
* configure.in (AC_PROG_LN_S): New check to define $(LN_S).
|
||||
|
||||
Thu Jun 3 14:39:17 CEST 2004 Paolo Molaro <[email protected]>
|
||||
|
||||
* configure.in: libc setting for NetBSD (patch from [email protected]).
|
||||
|
||||
2004-06-01 Raja R Harinath <[email protected]>
|
||||
|
||||
* Makefile.am (bootstrap,faststrap,fasterstrap): Refactor.
|
||||
Fix 'faststrap' to be corlib-version-change-safe.
|
||||
(one-stage-strap,two-stage-strap,three-stage-strap): Remove.
|
||||
(monolite-bootstrap): Update.
|
||||
|
||||
2004-05-31 Gonzalo Paniagua Javier <[email protected]>
|
||||
|
||||
* configure.in: fixlets for windows.
|
||||
|
||||
+81
-127
@@ -1,11 +1,10 @@
|
||||
AUTOMAKE_OPTIONS = foreign
|
||||
ACLOCAL_AMFLAGS = -I .
|
||||
|
||||
SUBDIRS = $(libgc_dir) mono $(ikvm_jni_dir) docs data runtime scripts man samples support web
|
||||
SUBDIRS = @libgc_dir@ mono @ikvm_jni_dir@ docs runtime scripts man data samples support web
|
||||
|
||||
# Keep in sync with SUBDIRS
|
||||
## 'tools' is not normally built
|
||||
DIST_SUBDIRS = libgc mono ikvm-jni docs data runtime scripts man samples support web tools
|
||||
DIST_SUBDIRS = libgc mono ikvm-jni docs runtime scripts man data samples support web tools
|
||||
|
||||
EXTRA_DIST= mono.pc.in mono.spec.in mint.pc.in
|
||||
|
||||
@@ -18,17 +17,16 @@ endif
|
||||
DISTCLEANFILES= mono.pc mint.pc
|
||||
|
||||
#
|
||||
# The following targets are used to compile and install
|
||||
# The following target is used to compile and install
|
||||
# mono and mcs without running into the out-of-sync
|
||||
# problems by doing the compilation in the right order.
|
||||
#
|
||||
|
||||
mcs_topdir=$(top_srcdir)/../mcs
|
||||
|
||||
.PHONY: bootstrap faststrap fasterstrap bootstrap-clean bootstrap-check get-monolite-latest monolite-bootstrap
|
||||
.PHONY: tmpinst-dir tmpinst-mcs-basic-build tmpinst-mcs-short-build tmpinst-mcs-full-build tmpinst-monolite
|
||||
.PHONY: mono-do-runtime-only mcs-do-basic-build mcs-do-short-build mcs-do-full-build mcs-do-clean-profiles mcs-do-run-test
|
||||
.PHONY: populate-runtime-subdir
|
||||
.PHONY: tmpinst-dir tmpinst-basic-build tmpinst-short-build tmpinst-full-build
|
||||
.PHONY: bootstrap faststrap fasterstrap one-stage-strap two-stage-strap three-stage-strap bootstrap-clean bootstrap-check
|
||||
.PHONY: mono-do-basic-build mcs-do-basic-build mcs-do-short-build mcs-do-full-build mcs-do-clean-profiles mcs-do-run-test
|
||||
|
||||
if USE_JIT
|
||||
mono_runtime = mono/mini/mono
|
||||
@@ -36,100 +34,74 @@ else
|
||||
mono_runtime = mono/interpreter/mint
|
||||
endif
|
||||
|
||||
# Minimal set of directories to build, and files used to run the 'mcs' compiler
|
||||
MCS_BASIC_DIRS = jay mcs class/corlib class/System
|
||||
MCS_BASIC_FILES = \
|
||||
$(mcs_topdir)/mcs/mcs.exe \
|
||||
$(mcs_topdir)/class/lib/default/mscorlib.dll \
|
||||
$(mcs_topdir)/class/lib/default/System.dll
|
||||
bootstrap: three-stage-strap
|
||||
|
||||
# Set of directories and files the 'mcs' compiler can use
|
||||
## We build class/System twice to resolve the cyclic dependency of class/System.XML
|
||||
MCS_DIRS = $(MCS_BASIC_DIRS) class/System.XML class/System class/Mono.CSharp.Debugger
|
||||
MCS_FILES = $(MCS_BASIC_FILES) \
|
||||
$(mcs_topdir)/class/lib/default/System.Xml.dll \
|
||||
$(mcs_topdir)/class/lib/default/Mono.CSharp.Debugger.dll
|
||||
faststrap: mono-do-basic-build
|
||||
$(MAKE) two-stage-strap
|
||||
|
||||
tmpinst = _tmpinst
|
||||
fasterstrap: mono-do-basic-build
|
||||
$(MAKE) one-stage-strap
|
||||
|
||||
if PLATFORM_WIN32
|
||||
three-stage-strap: tmpinst-basic-build
|
||||
$(MAKE) two-stage-strap
|
||||
|
||||
populate_profiles = default:net_1_1
|
||||
two-stage-strap: tmpinst-short-build
|
||||
$(MAKE) one-stage-strap
|
||||
|
||||
# bootstraps using the .NET C# compiler
|
||||
bootstrap: tmpinst-dir mono-do-runtime-only
|
||||
$(MAKE) fasterstrap
|
||||
|
||||
else
|
||||
|
||||
populate_profiles = default:net_1_1 net_2_0:net_2_0
|
||||
|
||||
bootstrap: tmpinst-mcs-basic-build mono-do-runtime-only
|
||||
$(MAKE) tmpinst-mcs-short-build
|
||||
$(MAKE) fasterstrap
|
||||
|
||||
endif
|
||||
|
||||
faststrap: tmpinst-mcs-short-build
|
||||
$(MAKE) mono-do-runtime-only
|
||||
$(MAKE) fasterstrap
|
||||
|
||||
fasterstrap: tmpinst-mcs-full-build
|
||||
$(MAKE) populate-runtime-subdir
|
||||
one-stage-strap: tmpinst-full-build
|
||||
rm -f $(top_srcdir)/runtime/*/*.dll $(top_srcdir)/runtime/*.exe
|
||||
$(MAKE)
|
||||
|
||||
bootstrap-clean: clean mcs-do-clean-profiles
|
||||
bootstrap-check: check mcs-do-run-test
|
||||
|
||||
# building with monolite
|
||||
# (takes advantage of 'make -j': independent subtasks are separate dependencies)
|
||||
tmpinst-basic-build: mcs-do-basic-build mono-do-basic-build tmpinst-dir
|
||||
mv -f $(mcs_topdir)/mcs/mcs.exe \
|
||||
$(mcs_topdir)/class/lib/default/mscorlib.dll \
|
||||
$(mcs_topdir)/class/lib/default/System.dll \
|
||||
_tmpinst/lib
|
||||
|
||||
get-monolite-latest:
|
||||
wget -O $(srcdir)/../monolite-latest.tar.gz http://www.go-mono.com/daily/monolite-latest.tar.gz
|
||||
tmpinst-short-build: mcs-do-short-build
|
||||
mv -f $(mcs_topdir)/mcs/mcs.exe \
|
||||
$(mcs_topdir)/class/lib/default/mscorlib.dll \
|
||||
$(mcs_topdir)/class/lib/default/System.dll \
|
||||
$(mcs_topdir)/class/lib/default/System.Xml.dll \
|
||||
$(mcs_topdir)/class/lib/default/Mono.CSharp.Debugger.dll \
|
||||
_tmpinst/lib
|
||||
|
||||
monolite-bootstrap: tmpinst-monolite mono-do-runtime-only
|
||||
rm -f $(MCS_FILES)
|
||||
$(MAKE) tmpinst-mcs-short-build
|
||||
$(MAKE) fasterstrap
|
||||
|
||||
# internal targets
|
||||
|
||||
tmpinst-mcs-basic-build: mcs-do-basic-build tmpinst-dir
|
||||
mv -f $(MCS_BASIC_FILES) $(tmpinst)/lib
|
||||
|
||||
tmpinst-mcs-short-build: mcs-do-short-build tmpinst-dir
|
||||
mv -f $(MCS_FILES) $(tmpinst)/lib
|
||||
|
||||
tmpinst-mcs-full-build: mcs-do-full-build tmpinst-dir
|
||||
cp -f $(MCS_FILES) $(tmpinst)/lib
|
||||
|
||||
tmpinst-monolite: tmpinst-dir
|
||||
-rm -f $(tmpinst)/lib/mcs.exe $(tmpinst)/lib/*.dll
|
||||
-rm -fr $(tmpinst)/monolite-*
|
||||
srcdir=`cd $(srcdir) && pwd` && cd $(tmpinst) && ( gzip -d -c $$srcdir/../monolite-latest.tar.gz | tar xf - )
|
||||
mv -f $(tmpinst)/monolite-*/mcs.exe $(tmpinst)/monolite-*/*.dll $(tmpinst)/lib
|
||||
rm -fr $(tmpinst)/monolite-*
|
||||
tmpinst-full-build: mcs-do-full-build
|
||||
cp -f $(mcs_topdir)/mcs/mcs.exe \
|
||||
$(mcs_topdir)/class/lib/default/mscorlib.dll \
|
||||
$(mcs_topdir)/class/lib/default/System.dll \
|
||||
$(mcs_topdir)/class/lib/default/System.Xml.dll \
|
||||
$(mcs_topdir)/class/lib/default/Mono.CSharp.Debugger.dll \
|
||||
_tmpinst/lib
|
||||
|
||||
# Build enough of 'mono' to run the stage1 mcs.exe
|
||||
mono-do-runtime-only: $(CONFIG_HEADER)
|
||||
for dir in $(libgc_dir) mono data; do \
|
||||
(cd $$dir && $(MAKE)) || exit 1 ; \
|
||||
done
|
||||
mono-do-basic-build: $(CONFIG_HEADER)
|
||||
if test -z "$(libgc_dir)"; then :; else cd libgc && $(MAKE) ; fi
|
||||
cd mono && $(MAKE)
|
||||
|
||||
mcs-do-basic-build:
|
||||
rm -f $(MCS_FILES)
|
||||
for dir in $(MCS_BASIC_DIRS); do \
|
||||
(cd $(mcs_topdir)/$$dir && $(MAKE) PROFILE=default USE_BOOT_COMPILE=yes BOOTSTRAP_MCS="mcs -d:BOOTSTRAP_WITH_OLDLIB") || exit 1 ; \
|
||||
done
|
||||
# Build stripped down versions of 'mcs', 'mscorlib.dll' and 'System.dll' with installed 'mcs'
|
||||
## remove System.Xml.dll since it's a soft-dependency of System.dll
|
||||
mcs-do-basic-build:
|
||||
rm -f $(mcs_topdir)/mcs/mcs.exe $(mcs_topdir)/class/lib/default/mscorlib.dll
|
||||
rm -f $(mcs_topdir)/class/lib/default/System.dll $(mcs_topdir)/class/lib/default/System.Xml.dll
|
||||
cd $(mcs_topdir)/jay && $(MAKE)
|
||||
cd $(mcs_topdir)/mcs && $(MAKE) PROFILE=default BOOTSTRAP_MCS="mcs -d:BOOTSTRAP_WITH_OLDLIB"
|
||||
cd $(mcs_topdir)/class/corlib && $(MAKE) PROFILE=default BOOTSTRAP_MCS="mcs -d:BOOTSTRAP_WITH_OLDLIB"
|
||||
cd $(mcs_topdir)/class/System && $(MAKE) PROFILE=default BOOTSTRAP_MCS="mcs -d:BOOTSTRAP_WITH_OLDLIB"
|
||||
|
||||
mcs-do-short-build:
|
||||
tmpinst=`cd $(tmpinst) && pwd` ; \
|
||||
tmpinst=`cd _tmpinst && pwd` ; \
|
||||
PATH=$$tmpinst/bin:$$PATH; export PATH ; \
|
||||
for dir in $(MCS_DIRS); do \
|
||||
for dir in jay mcs class/corlib class/System class/System.XML class/System class/Mono.CSharp.Debugger; do \
|
||||
(cd $(mcs_topdir)/$$dir && $(MAKE) PROFILE=default) || exit 1 ; \
|
||||
done
|
||||
|
||||
mcs-do-full-build:
|
||||
tmpinst=`cd $(tmpinst) && pwd` ; \
|
||||
tmpinst=`cd _tmpinst && pwd` ; \
|
||||
PATH=$$tmpinst/bin:$$PATH ; export PATH ; \
|
||||
cd $(mcs_topdir) && $(MAKE) all-profiles
|
||||
|
||||
@@ -137,62 +109,44 @@ mcs-do-clean-profiles:
|
||||
cd $(mcs_topdir) && $(MAKE) clean-profiles
|
||||
|
||||
mcs-do-run-test: tmpinst-dir
|
||||
tmpinst=`cd $(tmpinst) && pwd` ; \
|
||||
tmpinst=`cd _tmpinst && pwd` ; \
|
||||
PATH=$$tmpinst/bin:$$PATH ; export PATH ; \
|
||||
cd $(mcs_topdir) && $(MAKE) PROFILE=default run-test
|
||||
|
||||
populate-runtime-subdir:
|
||||
test -n '$(populate_profiles)'
|
||||
@srcdir=`cd $(srcdir) && pwd`; tmpinst=`pwd`/$(tmpinst) ; \
|
||||
PATH=$$tmpinst/bin:$$PATH ; export PATH ; \
|
||||
for profile in $(populate_profiles); do \
|
||||
( set fnord `echo $$profile | sed 's,:, ,g'` && \
|
||||
echo "cd $(mcs_topdir) && $(MAKE) PROGRAM_INSTALL_DIR=$$srcdir/runtime PROFILE=$$2 LIBRARY_INSTALL_DIR=$$srcdir/runtime/$$3 prefix=$$tmpinst/prefix install" && \
|
||||
cd $(mcs_topdir) && \
|
||||
$(MAKE) PROGRAM_INSTALL_DIR=$$srcdir/runtime PROFILE=$$2 LIBRARY_INSTALL_DIR=$$srcdir/runtime/$$3 prefix=$$tmpinst/prefix install ) || exit 1 ; \
|
||||
done
|
||||
find $(tmpinst)/prefix -type f -path '*/jay*' -exec rm -f '{}' ';'
|
||||
test -z "`find $(tmpinst)/prefix -type f -print`"
|
||||
rm -rf $(tmpinst)/prefix
|
||||
tmpinst-dir.stamp: Makefile.am
|
||||
set -e ; \
|
||||
rootme=`pwd`; tmpinst=$$rootme/_tmpinst ; \
|
||||
mkdir -p $$tmpinst $$tmpinst/bin $$tmpinst/lib ; \
|
||||
echo '#! /bin/sh' > $$tmpinst/bin/mono ; \
|
||||
echo 'if test -z "$$MONO_PATH" ; then MONO_PATH="'"$$tmpinst/lib"'"' >> $$tmpinst/bin/mono ; \
|
||||
echo 'else MONO_PATH=$${MONO_PATH}:"'"$$tmpinst/lib"'" ; fi' >> $$tmpinst/bin/mono ; \
|
||||
echo 'export MONO_PATH' >> $$tmpinst/bin/mono ; \
|
||||
echo 'exec "'"$$rootme/libtool"'" --mode=execute "'"$$rootme/$(mono_runtime)"'" "$$@"' >> $$tmpinst/bin/mono ; \
|
||||
echo '#! /bin/sh' > $$tmpinst/bin/mcs ; \
|
||||
echo 'exec "'"$$tmpinst/bin/mono"'" "'"$$tmpinst/lib/mcs.exe"'" "$$@"' >> $$tmpinst/bin/mcs ; \
|
||||
chmod +x $$tmpinst/bin/mono $$tmpinst/bin/mcs
|
||||
echo "stamp" > $@
|
||||
|
||||
tmpinst-dir:
|
||||
mkdir -p $(tmpinst) $(tmpinst)/bin $(tmpinst)/lib $(tmpinst)/etc/mono
|
||||
$(MAKE) tmpinst-dir-contents
|
||||
tmpinst-dir: tmpinst-dir.stamp
|
||||
@if test -d _tmpinst; then :; else rm -f tmpinst-dir.stamp; $(MAKE) tmpinst-dir.stamp; fi
|
||||
|
||||
tmpinst-dir-contents: $(tmpinst)/bin/mono $(tmpinst)/bin/mcs $(tmpinst)/etc/mono/machine.config
|
||||
|
||||
if PLATFORM_WIN32
|
||||
# building with monolite
|
||||
|
||||
$(tmpinst)/bin/mono: $(srcdir)/Makefile.am
|
||||
echo '#! /bin/sh' > $@
|
||||
echo 'builddir="'`pwd`'"; win_builddir="'`cygpath -w -a .`'"' >> $@
|
||||
echo 'tmpinst="$$win_builddir\\$(tmpinst)"' >> $@
|
||||
echo 'if test -z "$$MONO_PATH" ; then MONO_PATH="$$tmpinst\\lib"; else MONO_PATH="$${MONO_PATH};$$tmpinst\\lib" ; fi' >> $@
|
||||
echo 'MONO_CFG_DIR="$$tmpinst\\etc"' >> $@
|
||||
echo 'export MONO_PATH MONO_CFG_DIR' >> $@
|
||||
echo 'exec "$$builddir/libtool" --mode=execute "$$builddir/mono.exe" "$$@"' >> $@
|
||||
chmod +x $@
|
||||
get-monolite-latest:
|
||||
wget -O $(srcdir)/../monolite-latest.tar.gz http://www.go-mono.com/daily/monolite-latest.tar.gz
|
||||
|
||||
else
|
||||
tmpinst-monolite: tmpinst-dir
|
||||
-rm -f _tmpinst/lib/mcs.exe _tmpinst/lib/*.dll
|
||||
-rm -fr _tmpinst/monolite-*
|
||||
srcdir=`cd $(srcdir) && pwd` && cd _tmpinst && ( gzip -d -c $$srcdir/../monolite-latest.tar.gz | tar xf - )
|
||||
mv -f _tmpinst/monolite-*/mcs.exe _tmpinst/monolite-*/*.dll _tmpinst/lib
|
||||
rm -fr _tmpinst/monolite-*
|
||||
|
||||
$(tmpinst)/bin/mono: $(srcdir)/Makefile.am
|
||||
echo '#! /bin/sh' > $@
|
||||
echo 'builddir="'`pwd`'"; tmpinst=$$builddir/$(tmpinst)' >> $@
|
||||
echo 'if test -z "$$MONO_PATH" ; then MONO_PATH=$$tmpinst/lib; else MONO_PATH=$${MONO_PATH}:$$tmpinst/lib ; fi' >> $@
|
||||
echo 'MONO_CFG_DIR=$$tmpinst/etc' >> $@
|
||||
echo 'export MONO_PATH MONO_CFG_DIR' >> $@
|
||||
echo 'exec "$$builddir/libtool" --mode=execute "$$builddir/$(mono_runtime)" --config "$$builddir/data/config" "$$@"' >> $@
|
||||
chmod +x $@
|
||||
|
||||
endif
|
||||
|
||||
$(tmpinst)/bin/mcs: $(srcdir)/Makefile.am
|
||||
(t=`cd $(tmpinst) && pwd`; echo '#! /bin/sh'; echo 'exec "'"$$t/bin/mono"'" "'"$$t/lib/mcs.exe"'" "$$@"') > $@
|
||||
chmod +x $@
|
||||
|
||||
$(tmpinst)/etc/mono/machine.config: $(srcdir)/data/machine.config
|
||||
rm -f $@
|
||||
srcdir=`cd $(srcdir) && pwd`; cd $(tmpinst)/etc/mono && $(LN_S) $$srcdir/data/machine.config machine.config
|
||||
monolite-bootstrap: tmpinst-monolite mono-do-basic-build
|
||||
rm -f $(mcs_topdir)/mcs/mcs.exe $(mcs_topdir)/class/lib/default/mscorlib.dll
|
||||
rm -f $(mcs_topdir)/class/lib/default/System.dll $(mcs_topdir)/class/lib/default/System.Xml.dll Mono.CSharp.Debugger.dll
|
||||
$(MAKE) two-stage-strap
|
||||
|
||||
# Obsolete target -- don't use.
|
||||
.PHONY: fullbuild
|
||||
|
||||
+11
-57
@@ -1,11 +1,9 @@
|
||||
AC_INIT(README)
|
||||
AC_CANONICAL_SYSTEM
|
||||
AM_CONFIG_HEADER(config.h)
|
||||
AM_INIT_AUTOMAKE(mono,0.97)
|
||||
AM_INIT_AUTOMAKE(mono,0.95)
|
||||
AM_MAINTAINER_MODE
|
||||
|
||||
AC_PROG_LN_S
|
||||
|
||||
dnl
|
||||
dnl libgc checks
|
||||
dnl
|
||||
@@ -54,7 +52,6 @@ case "$host" in
|
||||
gc_default=boehm
|
||||
with_nptl=no
|
||||
with_sigaltstack=no
|
||||
LN_S=cp
|
||||
|
||||
;;
|
||||
*-*-*netbsd*)
|
||||
@@ -246,15 +243,14 @@ AC_SUBST(GMODULE_LIBS)
|
||||
|
||||
AC_ARG_WITH(gc, [ --with-gc=boehm,included,none],[gc=$with_gc],[gc=$gc_default])
|
||||
|
||||
# Enable support for fast thread-local storage
|
||||
# Some systems have broken support, so we allow to disable it.
|
||||
# This is misnamed: __thread support has no relation to NPTL,
|
||||
# but people already use it...
|
||||
AC_ARG_WITH(nptl, [ --with-nptl=yes,no enable/disable support for __thread support],[],[with_nptl=yes])
|
||||
# Enable support for NPTL only features like fast thread-local storage
|
||||
# We can't reliably detect nptl at compile & run time
|
||||
# so this option will stay until nptl becomes more widespread
|
||||
AC_ARG_WITH(nptl, [ --with-nptl=yes,no enable/disable support for NPTL],[],[with_nptl=yes])
|
||||
|
||||
# Enable support for using sigaltstack for SIGSEGV and stack overflow handling
|
||||
# This does not work on some platforms (bug #55253)
|
||||
AC_ARG_WITH(sigaltstack, [ --with-sigaltstack=yes,no enable/disable support for sigaltstack],[],[with_sigaltstack=no])
|
||||
AC_ARG_WITH(sigaltstack, [ --with-sigaltstack=yes,no enable/disable support for sigaltstack],[],[with_sigaltstack=yes])
|
||||
|
||||
# assembly bundle support, see metadata/make-bundle.pl for more info
|
||||
AC_ARG_WITH(bundle, [ --with-bundle=bundle_template],[
|
||||
@@ -908,34 +904,6 @@ else
|
||||
jdk_headers_found=no
|
||||
AC_CHECK_LIB(ws2_32, main, LIBS="$LIBS -lws2_32", AC_ERROR(bad mingw install?))
|
||||
AC_CHECK_LIB(psapi, main, LIBS="$LIBS -lpsapi", AC_ERROR(bad mingw install?))
|
||||
|
||||
dnl *********************************
|
||||
dnl *** Check for struct ip_mreqn ***
|
||||
dnl *********************************
|
||||
AC_MSG_CHECKING(for struct ip_mreqn)
|
||||
AC_TRY_COMPILE([#include <ws2tcpip.h>], [
|
||||
struct ip_mreqn mreq;
|
||||
mreq.imr_address.s_addr = 0;
|
||||
], [
|
||||
# Yes, we have it...
|
||||
AC_MSG_RESULT(yes)
|
||||
AC_DEFINE(HAVE_STRUCT_IP_MREQN)
|
||||
], [
|
||||
# We'll just have to try and use struct ip_mreq
|
||||
AC_MSG_RESULT(no)
|
||||
AC_MSG_CHECKING(for struct ip_mreq)
|
||||
AC_TRY_COMPILE([#include <ws2tcpip.h>], [
|
||||
struct ip_mreq mreq;
|
||||
mreq.imr_interface.s_addr = 0;
|
||||
], [
|
||||
# Yes, we have it...
|
||||
AC_MSG_RESULT(yes)
|
||||
AC_DEFINE(HAVE_STRUCT_IP_MREQ)
|
||||
], [
|
||||
# No multicast support
|
||||
AC_MSG_RESULT(no)
|
||||
])
|
||||
])
|
||||
fi
|
||||
|
||||
dnl socklen_t check
|
||||
@@ -1076,7 +1044,6 @@ ACCESS_UNALIGNED="yes"
|
||||
|
||||
JIT_SUPPORTED=no
|
||||
LIBC="libc.so.6"
|
||||
INTL="libc.so.6"
|
||||
|
||||
jit_wanted=false
|
||||
case "$host" in
|
||||
@@ -1101,15 +1068,12 @@ case "$host" in
|
||||
JIT_SUPPORTED=yes
|
||||
ACCESS_UNALIGNED="no"
|
||||
LIBC="libc.so"
|
||||
INTL="libintl.so"
|
||||
jit_wanted=true
|
||||
;;
|
||||
alpha*-*-linux* | alpha*-*-osf*)
|
||||
TARGET=ALPHA;
|
||||
ACCESS_UNALIGNED="no"
|
||||
JIT_SUPPORTED=no
|
||||
arch_target=alpha;
|
||||
;;
|
||||
# alpha*-*-linux* | alpha*-*-osf*)
|
||||
# TARGET=ALPHA;
|
||||
# ACCESS_UNALIGNED="no"
|
||||
# ;;
|
||||
# ia64-*-linux* | ia64-*-hpux*)
|
||||
# TARGET=IA64;
|
||||
# arch_target=ia64;
|
||||
@@ -1129,11 +1093,6 @@ case "$host" in
|
||||
LIBC="libc.sl"
|
||||
ACCESS_UNALIGNED="no"
|
||||
;;
|
||||
hppa*linux*)
|
||||
TARGET=HPPA;
|
||||
arch_target=hppa;
|
||||
ACCESS_UNALIGNED="no"
|
||||
;;
|
||||
macppc-*-openbsd* | powerpc-*-linux* | powerpc-*-openbsd* | \
|
||||
powerpc-*-sysv* | powerpc-*-darwin*)
|
||||
TARGET=POWERPC;
|
||||
@@ -1178,10 +1137,6 @@ case "$host" in
|
||||
powerpc-*-darwin*)
|
||||
libsuffix=".dylib"
|
||||
LIBC="libc.dylib"
|
||||
INTL="libintl.dylib"
|
||||
;;
|
||||
*-*-*netbsd*)
|
||||
LIBC="libc.so.12"
|
||||
;;
|
||||
esac
|
||||
AC_SUBST(libsuffix)
|
||||
@@ -1239,7 +1194,6 @@ AM_CONDITIONAL(HPPA, test x$TARGET = xHPPA)
|
||||
AM_CONDITIONAL(JIT_SUPPORTED, test x$JIT_SUPPORTED = xyes)
|
||||
|
||||
AC_SUBST(LIBC)
|
||||
AC_SUBST(INTL)
|
||||
|
||||
AC_SUBST(arch_target)
|
||||
AC_SUBST(CFLAGS)
|
||||
@@ -1298,7 +1252,7 @@ echo "
|
||||
|
||||
GC: $gc
|
||||
ICU: $enable_icu
|
||||
__thread: $with_nptl
|
||||
NPTL: $with_nptl
|
||||
SIGALTSTACK: $with_sigaltstack
|
||||
Engine: $jit_status
|
||||
2.0 Alpha: $PREVIEW
|
||||
|
||||
@@ -2,3 +2,4 @@ Makefile.in
|
||||
Makefile
|
||||
config
|
||||
.cvsignore
|
||||
browscap.ini
|
||||
+6
-1
@@ -3,10 +3,15 @@ monodir = $(sysconfdir)/mono
|
||||
EXTRA_DIST = config.in \
|
||||
machine.config \
|
||||
DefaultWsdlHelpGenerator.aspx \
|
||||
browscap.ini
|
||||
browscap.ini.gz
|
||||
|
||||
mono_DATA = config \
|
||||
machine.config \
|
||||
DefaultWsdlHelpGenerator.aspx \
|
||||
browscap.ini
|
||||
|
||||
CLEANFILES = browscap.ini
|
||||
|
||||
browscap.ini: browscap.ini.gz
|
||||
gunzip -c $^ > $@
|
||||
|
||||
-13082
File diff suppressed because it is too large.
Load diff
Binary file not shown.
@@ -1,7 +1,6 @@
|
||||
<configuration>
|
||||
<dllmap dll="cygwin1.dll" target="@LIBC@" />
|
||||
<dllmap dll="libc" target="@LIBC@" />
|
||||
<dllmap dll="libintl" target="@INTL@" />
|
||||
<dllmap dll="libxslt.dll" target="libxslt@libsuffix@" />
|
||||
<dllmap dll="libmySQL.dll" target="libmysqlclient@libsuffix@" />
|
||||
<dllmap dll="odbc32.dll" target="libodbc@libsuffix@" />
|
||||
|
||||
@@ -35,8 +35,6 @@
|
||||
type="System.Web.Configuration.CustomErrorsConfigHandler, System.Web, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
|
||||
<section name="pages"
|
||||
type="System.Web.Configuration.PagesConfigurationHandler, System.Web, Version=1.0.5000.0, Culture=neutral" />
|
||||
<section name="clientTarget"
|
||||
type="System.Web.Configuration.ClientTargetSectionHandler, System.Web, Version=1.0.5000.0, Culture=neutral" />
|
||||
</sectionGroup>
|
||||
<sectionGroup name="system.net">
|
||||
<section name="settings"
|
||||
@@ -152,12 +150,6 @@
|
||||
enableSessionState="true"
|
||||
autoEventWireup="true"
|
||||
validateRequest="true" />
|
||||
<clientTarget>
|
||||
<add alias="ie5" userAgent="Mozilla/4.0 (compatible; MSIE 5.5; Windows NT 4.0)" />
|
||||
<add alias="ie4" userAgent="Mozilla/4.0 (compatible; MSIE 4.0; Windows NT 4.0)" />
|
||||
<add alias="uplevel" userAgent="Mozilla/4.0 (compatible; MSIE 4.0; Windows NT 4.0)" />
|
||||
<add alias="downlevel" userAgent="Unknown" />
|
||||
</clientTarget>
|
||||
</system.web>
|
||||
|
||||
<system.runtime.remoting>
|
||||
@@ -198,19 +190,6 @@
|
||||
</system.diagnostics>
|
||||
<system.drawing>
|
||||
</system.drawing>
|
||||
|
||||
<strongNames>
|
||||
<pubTokenMapping>
|
||||
<!-- ECMA key -->
|
||||
<map Token="b77a5c561934e089" PublicKey="002400000480000094000000060200000024000052534131000400000100010079159977d2d03a8e6bea7a2e74e8d1afcc93e8851974952bb480a12c9134474d04062447c37e0e68c080536fcf3c3fbe2ff9c979ce998475e506e8ce82dd5b0f350dc10e93bf2eeecf874b24770c5081dbea7447fddafa277b22de47d6ffea449674a4f9fccf84d15069089380284dbdd35f46cdff12a1bd78e4ef0065d016df" />
|
||||
<!-- Microsoft (final) key -->
|
||||
<map Token="b03f5f7f11d50a3a" PublicKey="002400000480000094000000060200000024000052534131000400000100010079159977d2d03a8e6bea7a2e74e8d1afcc93e8851974952bb480a12c9134474d04062447c37e0e68c080536fcf3c3fbe2ff9c979ce998475e506e8ce82dd5b0f350dc10e93bf2eeecf874b24770c5081dbea7447fddafa277b22de47d6ffea449674a4f9fccf84d15069089380284dbdd35f46cdff12a1bd78e4ef0065d016df" />
|
||||
<!-- Microsoft (Web Service Enhancement) key -->
|
||||
<map Token="31bf3856ad364e35" PublicKey="002400000480000094000000060200000024000052534131000400000100010079159977d2d03a8e6bea7a2e74e8d1afcc93e8851974952bb480a12c9134474d04062447c37e0e68c080536fcf3c3fbe2ff9c979ce998475e506e8ce82dd5b0f350dc10e93bf2eeecf874b24770c5081dbea7447fddafa277b22de47d6ffea449674a4f9fccf84d15069089380284dbdd35f46cdff12a1bd78e4ef0065d016df" />
|
||||
<!-- IBM (DB2 Data Provider) key -->
|
||||
<map Token="7c307b91aa13d208" PublicKey="002400000480000094000000060200000024000052534131000400000100010079159977d2d03a8e6bea7a2e74e8d1afcc93e8851974952bb480a12c9134474d04062447c37e0e68c080536fcf3c3fbe2ff9c979ce998475e506e8ce82dd5b0f350dc10e93bf2eeecf874b24770c5081dbea7447fddafa277b22de47d6ffea449674a4f9fccf84d15069089380284dbdd35f46cdff12a1bd78e4ef0065d016df" />
|
||||
</pubTokenMapping>
|
||||
</strongNames>
|
||||
</configuration>
|
||||
|
||||
|
||||
@@ -0,0 +1,246 @@
|
||||
System.Object
|
||||
System.Exception
|
||||
System.ValueType
|
||||
System.Delegate
|
||||
System.MulticastDelegate
|
||||
System.Enum
|
||||
System.Activator
|
||||
System.ArgIterator
|
||||
System.__ComObject
|
||||
System.TypedReference
|
||||
System.Security.AllowPartiallyTrustedCallersAttribute
|
||||
System.Runtime.Serialization.Formatter
|
||||
System.Runtime.Serialization.FormatterConverter
|
||||
System.Runtime.Serialization.FormatterServices
|
||||
System.Runtime.Serialization.ObjectIDGenerator
|
||||
System.Runtime.Serialization.ObjectManager
|
||||
System.Reflection.ModuleResolveEventHandler
|
||||
System.Reflection.Pointer
|
||||
System.Globalization.CompareInfo
|
||||
System.Globalization.HebrewCalendar
|
||||
System.Globalization.HijriCalendar
|
||||
System.Globalization.JapaneseCalendar
|
||||
System.Globalization.KoreanCalendar
|
||||
System.Globalization.SortKey
|
||||
System.Globalization.StringInfo
|
||||
System.Globalization.TaiwanCalendar
|
||||
System.Globalization.TextElementEnumerator
|
||||
System.Globalization.TextInfo
|
||||
System.Globalization.ThaiBuddhistCalendar
|
||||
System.IO.IsolatedStorage.IsolatedStorageFile
|
||||
System.Reflection.Emit.MethodRental
|
||||
System.Runtime.CompilerServices.AccessedThroughPropertyAttribute
|
||||
System.Runtime.CompilerServices.CallConvCdecl
|
||||
System.Runtime.CompilerServices.CallConvStdcall
|
||||
System.Runtime.CompilerServices.CallConvThiscall
|
||||
System.Runtime.CompilerServices.CallConvFastcall
|
||||
System.Runtime.CompilerServices.CustomConstantAttribute
|
||||
System.Runtime.CompilerServices.DateTimeConstantAttribute
|
||||
System.Runtime.CompilerServices.DiscardableAttribute
|
||||
System.Runtime.CompilerServices.DecimalConstantAttribute
|
||||
System.Runtime.CompilerServices.CompilationRelaxationsAttribute
|
||||
System.Runtime.CompilerServices.CompilerGlobalScopeAttribute
|
||||
System.Runtime.CompilerServices.IDispatchConstantAttribute
|
||||
System.Runtime.CompilerServices.IsVolatile
|
||||
System.Runtime.CompilerServices.IUnknownConstantAttribute
|
||||
System.Runtime.CompilerServices.RequiredAttributeAttribute
|
||||
System.Runtime.InteropServices.ArrayWithOffset
|
||||
System.Runtime.InteropServices.DispIdAttribute
|
||||
System.Runtime.InteropServices.ClassInterfaceType
|
||||
System.Runtime.InteropServices.ClassInterfaceAttribute
|
||||
System.Runtime.InteropServices.ComVisibleAttribute
|
||||
System.Runtime.InteropServices.LCIDConversionAttribute
|
||||
System.Runtime.InteropServices.ComRegisterFunctionAttribute
|
||||
System.Runtime.InteropServices.ComUnregisterFunctionAttribute
|
||||
System.Runtime.InteropServices.ProgIdAttribute
|
||||
System.Runtime.InteropServices.ImportedFromTypeLibAttribute
|
||||
System.Runtime.InteropServices.IDispatchImplType
|
||||
System.Runtime.InteropServices.IDispatchImplAttribute
|
||||
System.Runtime.InteropServices.ComSourceInterfacesAttribute
|
||||
System.Runtime.InteropServices.ComConversionLossAttribute
|
||||
System.Runtime.InteropServices.TypeLibTypeFlags
|
||||
System.Runtime.InteropServices.TypeLibFuncFlags
|
||||
System.Runtime.InteropServices.TypeLibVarFlags
|
||||
System.Runtime.InteropServices.TypeLibTypeAttribute
|
||||
System.Runtime.InteropServices.TypeLibFuncAttribute
|
||||
System.Runtime.InteropServices.TypeLibVarAttribute
|
||||
System.Runtime.InteropServices.ComImportAttribute
|
||||
System.Runtime.InteropServices.PreserveSigAttribute
|
||||
System.Runtime.InteropServices.ComAliasNameAttribute
|
||||
System.Runtime.InteropServices.AutomationProxyAttribute
|
||||
System.Runtime.InteropServices.PrimaryInteropAssemblyAttribute
|
||||
System.Runtime.InteropServices.CoClassAttribute
|
||||
System.Runtime.InteropServices.ComEventInterfaceAttribute
|
||||
System.Runtime.InteropServices.COMException
|
||||
System.Runtime.InteropServices.ComMemberType
|
||||
System.Runtime.InteropServices.CurrencyWrapper
|
||||
System.Runtime.InteropServices.DispatchWrapper
|
||||
System.Runtime.InteropServices.ErrorWrapper
|
||||
System.Runtime.InteropServices.ExtensibleClassFactory
|
||||
System.Runtime.InteropServices.HandleRef
|
||||
System.Runtime.InteropServices.InvalidComObjectException
|
||||
System.Runtime.InteropServices.InvalidOleVariantTypeException
|
||||
System.Runtime.InteropServices.TypeLibImporterFlags
|
||||
System.Runtime.InteropServices.ExporterEventKind
|
||||
System.Runtime.InteropServices.ITypeLibExporterNotifySink
|
||||
System.Runtime.InteropServices.ITypeLibConverter
|
||||
System.Runtime.InteropServices.MarshalDirectiveException
|
||||
System.Runtime.InteropServices.ObjectCreationDelegate
|
||||
System.Runtime.InteropServices.RuntimeEnvironment
|
||||
System.Runtime.InteropServices.RegistrationServices
|
||||
System.Runtime.InteropServices.SafeArrayRankMismatchException
|
||||
System.Runtime.InteropServices.SafeArrayTypeMismatchException
|
||||
System.Runtime.InteropServices.SEHException
|
||||
System.Runtime.InteropServices.TypeLibConverter
|
||||
System.Runtime.InteropServices.BIND_OPTS
|
||||
System.Runtime.InteropServices.UCOMIBindCtx
|
||||
System.Runtime.InteropServices.UCOMIConnectionPointContainer
|
||||
System.Runtime.InteropServices.UCOMIConnectionPoint
|
||||
System.Runtime.InteropServices.UCOMIEnumMoniker
|
||||
System.Runtime.InteropServices.CONNECTDATA
|
||||
System.Runtime.InteropServices.UCOMIEnumConnections
|
||||
System.Runtime.InteropServices.UCOMIEnumConnectionPoints
|
||||
System.Runtime.InteropServices.UCOMIEnumString
|
||||
System.Runtime.InteropServices.UCOMIEnumVARIANT
|
||||
System.Runtime.InteropServices.FILETIME
|
||||
System.Runtime.InteropServices.UCOMIMoniker
|
||||
System.Runtime.InteropServices.UCOMIPersistFile
|
||||
System.Runtime.InteropServices.UCOMIRunningObjectTable
|
||||
System.Runtime.InteropServices.STATSTG
|
||||
System.Runtime.InteropServices.UCOMIStream
|
||||
System.Runtime.InteropServices.DESCKIND
|
||||
System.Runtime.InteropServices.BINDPTR
|
||||
System.Runtime.InteropServices.UCOMITypeComp
|
||||
System.Runtime.InteropServices.TYPEKIND
|
||||
System.Runtime.InteropServices.TYPEFLAGS
|
||||
System.Runtime.InteropServices.IMPLTYPEFLAGS
|
||||
System.Runtime.InteropServices.TYPEATTR
|
||||
System.Runtime.InteropServices.FUNCDESC
|
||||
System.Runtime.InteropServices.IDLFLAG
|
||||
System.Runtime.InteropServices.IDLDESC
|
||||
System.Runtime.InteropServices.PARAMFLAG
|
||||
System.Runtime.InteropServices.PARAMDESC
|
||||
System.Runtime.InteropServices.TYPEDESC
|
||||
System.Runtime.InteropServices.ELEMDESC
|
||||
System.Runtime.InteropServices.VARDESC
|
||||
System.Runtime.InteropServices.DISPPARAMS
|
||||
System.Runtime.InteropServices.EXCEPINFO
|
||||
System.Runtime.InteropServices.FUNCKIND
|
||||
System.Runtime.InteropServices.INVOKEKIND
|
||||
System.Runtime.InteropServices.CALLCONV
|
||||
System.Runtime.InteropServices.FUNCFLAGS
|
||||
System.Runtime.InteropServices.VARFLAGS
|
||||
System.Runtime.InteropServices.UCOMITypeInfo
|
||||
System.Runtime.InteropServices.SYSKIND
|
||||
System.Runtime.InteropServices.LIBFLAGS
|
||||
System.Runtime.InteropServices.TYPELIBATTR
|
||||
System.Runtime.InteropServices.UCOMITypeLib
|
||||
System.Runtime.InteropServices.UnknownWrapper
|
||||
System.Runtime.Remoting.IObjectHandle
|
||||
System.Runtime.Remoting.IRemotingTypeInfo
|
||||
System.Runtime.Remoting.IChannelInfo
|
||||
System.Runtime.Remoting.IEnvoyInfo
|
||||
System.Runtime.Remoting.RemotingConfiguration
|
||||
System.Runtime.Remoting.TypeEntry
|
||||
System.Runtime.Remoting.ActivatedClientTypeEntry
|
||||
System.Runtime.Remoting.ActivatedServiceTypeEntry
|
||||
System.Runtime.Remoting.WellKnownClientTypeEntry
|
||||
System.Runtime.Remoting.WellKnownServiceTypeEntry
|
||||
System.Runtime.Remoting.RemotingException
|
||||
System.Runtime.Remoting.ServerException
|
||||
System.Runtime.Remoting.RemotingTimeoutException
|
||||
System.Runtime.Remoting.RemotingServices
|
||||
System.Runtime.Remoting.InternalRemotingServices
|
||||
System.Runtime.Remoting.SoapServices
|
||||
System.Runtime.Remoting.Activation.UrlAttribute
|
||||
System.Runtime.Remoting.Messaging.IMessageSink
|
||||
System.Runtime.Remoting.Messaging.AsyncResult
|
||||
System.Runtime.Remoting.Messaging.CallContext
|
||||
System.Runtime.Remoting.Messaging.ILogicalThreadAffinative
|
||||
System.Runtime.Remoting.Messaging.InternalMessageWrapper
|
||||
System.Runtime.Remoting.Messaging.IMethodCallMessage
|
||||
System.Runtime.Remoting.Messaging.MethodCallMessageWrapper
|
||||
System.Runtime.Remoting.Messaging.HeaderHandler
|
||||
System.Runtime.Remoting.Messaging.IMessageCtrl
|
||||
System.Runtime.Remoting.Messaging.IRemotingFormatter
|
||||
System.Runtime.Remoting.Messaging.ReturnMessage
|
||||
System.Runtime.Remoting.Messaging.MethodCall
|
||||
System.Runtime.Remoting.Messaging.ConstructionCall
|
||||
System.Runtime.Remoting.Messaging.MethodResponse
|
||||
System.Runtime.Remoting.Messaging.ConstructionResponse
|
||||
System.Runtime.Remoting.Messaging.MethodReturnMessageWrapper
|
||||
System.Runtime.Remoting.Messaging.OneWayAttribute
|
||||
System.Runtime.Remoting.Messaging.MessageSurrogateFilter
|
||||
System.Runtime.Remoting.Messaging.RemotingSurrogateSelector
|
||||
System.Runtime.Remoting.Contexts.CrossContextDelegate
|
||||
System.Runtime.Remoting.Contexts.ContextProperty
|
||||
System.Runtime.Remoting.Contexts.IContextPropertyActivator
|
||||
System.Runtime.Remoting.Contexts.IContributeClientContextSink
|
||||
System.Runtime.Remoting.Contexts.IContributeDynamicSink
|
||||
System.Runtime.Remoting.Contexts.IContributeEnvoySink
|
||||
System.Runtime.Remoting.Contexts.IContributeObjectSink
|
||||
System.Runtime.Remoting.Contexts.IContributeServerContextSink
|
||||
System.Runtime.Serialization.Formatters.InternalRM
|
||||
System.Runtime.Serialization.Formatters.InternalST
|
||||
System.Runtime.Serialization.Formatters.SoapMessage
|
||||
System.Runtime.Serialization.Formatters.SoapFault
|
||||
System.Runtime.Serialization.Formatters.ServerFault
|
||||
System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
|
||||
System.Security.Cryptography.CryptoConfig
|
||||
System.Security.Cryptography.KeyedHashAlgorithm
|
||||
System.Security.Cryptography.HMACSHA1
|
||||
System.Security.Cryptography.MACTripleDES
|
||||
System.Security.Cryptography.MaskGenerationMethod
|
||||
System.Security.Cryptography.PasswordDeriveBytes
|
||||
System.Security.Cryptography.PKCS1MaskGenerationMethod
|
||||
System.Security.Cryptography.RC2
|
||||
System.Security.Cryptography.RC2CryptoServiceProvider
|
||||
System.Security.Cryptography.RSACryptoServiceProvider
|
||||
System.Security.Cryptography.RSAOAEPKeyExchangeDeformatter
|
||||
System.Security.Cryptography.RSAOAEPKeyExchangeFormatter
|
||||
System.Security.Cryptography.RSAPKCS1KeyExchangeDeformatter
|
||||
System.Security.Cryptography.RSAPKCS1KeyExchangeFormatter
|
||||
System.Security.Cryptography.RSAPKCS1SignatureDeformatter
|
||||
System.Security.Cryptography.RSAPKCS1SignatureFormatter
|
||||
System.Security.Cryptography.SHA1Managed
|
||||
System.Security.Cryptography.TripleDES
|
||||
System.Security.Cryptography.TripleDESCryptoServiceProvider
|
||||
System.Security.Permissions.EnvironmentPermission
|
||||
System.Security.Permissions.FileDialogPermission
|
||||
System.Security.Permissions.IsolatedStorageFilePermission
|
||||
System.Security.Permissions.PrincipalPermissionAttribute
|
||||
System.Security.Permissions.SecurityPermissionAttribute
|
||||
System.Security.Permissions.PublisherIdentityPermissionAttribute
|
||||
System.Security.Permissions.PublisherIdentityPermission
|
||||
System.Security.Permissions.ReflectionPermission
|
||||
System.Security.Permissions.RegistryPermission
|
||||
System.Security.Permissions.PrincipalPermission
|
||||
System.Security.Permissions.SiteIdentityPermission
|
||||
System.Security.Permissions.StrongNameIdentityPermission
|
||||
System.Security.Permissions.StrongNamePublicKeyBlob
|
||||
System.Security.Permissions.UIPermission
|
||||
System.Security.Permissions.UrlIdentityPermission
|
||||
System.Security.Permissions.ZoneIdentityPermission
|
||||
System.Security.Policy.ApplicationDirectory
|
||||
System.Security.Policy.ApplicationDirectoryMembershipCondition
|
||||
System.Security.Policy.FirstMatchCodeGroup
|
||||
System.Security.Policy.Hash
|
||||
System.Security.Policy.HashMembershipCondition
|
||||
System.Security.Policy.NetCodeGroup
|
||||
System.Security.Policy.PermissionRequestEvidence
|
||||
System.Security.Policy.Publisher
|
||||
System.Security.Policy.PublisherMembershipCondition
|
||||
System.Security.Policy.Site
|
||||
System.Security.Policy.SiteMembershipCondition
|
||||
System.Security.Policy.StrongName
|
||||
System.Security.Policy.StrongNameMembershipCondition
|
||||
System.Security.Policy.UnionCodeGroup
|
||||
System.Security.Policy.Url
|
||||
System.Security.Policy.UrlMembershipCondition
|
||||
System.Security.Policy.Zone
|
||||
System.Security.Policy.ZoneMembershipCondition
|
||||
System.Security.Principal.WindowsIdentity
|
||||
System.Security.Principal.WindowsImpersonationContext
|
||||
System.Security.Principal.WindowsPrincipal
|
||||
System.Threading.CompressedStack
|
||||
|
||||
@@ -1,11 +1,3 @@
|
||||
2004-06-24 David Waite <[email protected]>
|
||||
|
||||
* mono-jni.c: change to C90-style comments from C99/C++-style
|
||||
|
||||
Fri Jun 18 13:46:05 CEST 2004 Paolo Molaro <[email protected]>
|
||||
|
||||
* mono-jni.c: updates for the API cleanups.
|
||||
|
||||
2004-05-05 Zoltan Varga <[email protected]>
|
||||
|
||||
* mono-jni.c: Implement some missing JNI functions.
|
||||
|
||||
+25
-25
@@ -149,8 +149,8 @@ StringFromUTF8 (const char* psz)
|
||||
/* TODO: */
|
||||
return mono_string_new (mono_domain_get (), psz);
|
||||
#if 0
|
||||
/* Sun's modified UTF8 encoding is not compatible with System::Text::Encoding::UTF8, so */
|
||||
/* we need to roll our own */
|
||||
// Sun's modified UTF8 encoding is not compatible with System::Text::Encoding::UTF8, so
|
||||
// we need to roll our own
|
||||
int len, res_len, i;
|
||||
int *res;
|
||||
|
||||
@@ -163,16 +163,16 @@ StringFromUTF8 (const char* psz)
|
||||
switch (c >> 4)
|
||||
{
|
||||
case 0: case 1: case 2: case 3: case 4: case 5: case 6: case 7:
|
||||
/* 0xxxxxxx */
|
||||
// 0xxxxxxx
|
||||
break;
|
||||
case 12: case 13:
|
||||
/* 110x xxxx 10xx xxxx */
|
||||
// 110x xxxx 10xx xxxx
|
||||
char2 = *psz++;
|
||||
i++;
|
||||
c = (((c & 0x1F) << 6) | (char2 & 0x3F));
|
||||
break;
|
||||
case 14:
|
||||
/* 1110 xxxx 10xx xxxx 10xx xxxx */
|
||||
// 1110 xxxx 10xx xxxx 10xx xxxx
|
||||
char2 = *psz++;
|
||||
char3 = *psz++;
|
||||
i++;
|
||||
@@ -263,50 +263,50 @@ static jobject JNICALL CallObjectMethodA (JNIEnv *env, jobject obj, jmethodID me
|
||||
static MonoObject *
|
||||
box_Boolean (jboolean val)
|
||||
{
|
||||
return mono_value_box (mono_domain_get (), mono_get_boolean_class (), &val);
|
||||
return mono_value_box (mono_domain_get (), mono_defaults.boolean_class, &val);
|
||||
}
|
||||
|
||||
static MonoObject *
|
||||
box_Byte (jbyte val)
|
||||
{
|
||||
/* Sbyte ! */
|
||||
return mono_value_box (mono_domain_get (), mono_get_sbyte_class (), &val);
|
||||
return mono_value_box (mono_domain_get (), mono_defaults.sbyte_class, &val);
|
||||
}
|
||||
|
||||
static MonoObject *
|
||||
box_Char (jchar val)
|
||||
{
|
||||
return mono_value_box (mono_domain_get (), mono_get_char_class (), &val);
|
||||
return mono_value_box (mono_domain_get (), mono_defaults.char_class, &val);
|
||||
}
|
||||
|
||||
static MonoObject *
|
||||
box_Short (jshort val)
|
||||
{
|
||||
return mono_value_box (mono_domain_get (), mono_get_int16_class (), &val);
|
||||
return mono_value_box (mono_domain_get (), mono_defaults.int16_class, &val);
|
||||
}
|
||||
|
||||
static MonoObject *
|
||||
box_Int (jint val)
|
||||
{
|
||||
return mono_value_box (mono_domain_get (), mono_get_int32_class (), &val);
|
||||
return mono_value_box (mono_domain_get (), mono_defaults.int32_class, &val);
|
||||
}
|
||||
|
||||
static MonoObject *
|
||||
box_Long (jlong val)
|
||||
{
|
||||
return mono_value_box (mono_domain_get (), mono_get_int64_class (), &val);
|
||||
return mono_value_box (mono_domain_get (), mono_defaults.int64_class, &val);
|
||||
}
|
||||
|
||||
static MonoObject *
|
||||
box_Float (jfloat val)
|
||||
{
|
||||
return mono_value_box (mono_domain_get (), mono_get_single_class (), &val);
|
||||
return mono_value_box (mono_domain_get (), mono_defaults.single_class, &val);
|
||||
}
|
||||
|
||||
static MonoObject *
|
||||
box_Double (jdouble val)
|
||||
{
|
||||
return mono_value_box (mono_domain_get (), mono_get_double_class (), &val);
|
||||
return mono_value_box (mono_domain_get (), mono_defaults.double_class, &val);
|
||||
}
|
||||
|
||||
static int
|
||||
@@ -327,7 +327,7 @@ InvokeHelper (JNIEnv *env, jobject object, jmethodID methodID, jvalue* args)
|
||||
MonoObject **argarray;
|
||||
MonoArray *args2;
|
||||
|
||||
/* assert(!pLocalRefs->PendingException); */
|
||||
// assert(!pLocalRefs->PendingException);
|
||||
g_assert(methodID);
|
||||
|
||||
argc = GetMethodArgs(methodID, sig);
|
||||
@@ -368,7 +368,7 @@ InvokeHelper (JNIEnv *env, jobject object, jmethodID methodID, jvalue* args)
|
||||
}
|
||||
}
|
||||
|
||||
args2 = mono_array_new (mono_domain_get (), mono_get_object_class (), argc);
|
||||
args2 = mono_array_new (mono_domain_get (), mono_defaults.object_class, argc);
|
||||
for (i = 0; i < argc; ++i)
|
||||
mono_array_set (args2, MonoObject*, i, argarray [i]);
|
||||
|
||||
@@ -475,7 +475,7 @@ METHOD_IMPL(Double,jdouble)
|
||||
|
||||
|
||||
|
||||
/* TODO: These should be put into the macros above... */
|
||||
// TODO: These should be put into the macros above...
|
||||
static void JNICALL CallVoidMethodA (JNIEnv *env, jobject obj, jmethodID methodID, jvalue * args) {
|
||||
InvokeHelper(env, obj, methodID, args);
|
||||
}
|
||||
@@ -581,7 +581,7 @@ static type JNICALL GetStatic##Type##Field(JNIEnv *env, jclass clazz, jfieldID f
|
||||
|
||||
|
||||
|
||||
/* return *(cpptype*)BOXED_VALUE (jniFuncs.GetFieldValue (fieldID, jniFuncs.UnwrapRef (obj))); */
|
||||
// return *(cpptype*)BOXED_VALUE (jniFuncs.GetFieldValue (fieldID, jniFuncs.UnwrapRef (obj)));
|
||||
|
||||
GET_SET_FIELD(Boolean,jboolean,gboolean)
|
||||
GET_SET_FIELD(Byte,jbyte, gchar)
|
||||
@@ -734,42 +734,42 @@ static jobjectArray JNICALL NewObjectArray (JNIEnv *env, jsize len, jclass clazz
|
||||
|
||||
static jbooleanArray JNICALL NewBooleanArray (JNIEnv *env, jsize len)
|
||||
{
|
||||
return (jbooleanArray)new_java_array (env, mono_get_boolean_class (), len);
|
||||
return (jbooleanArray)new_java_array (env, mono_defaults.boolean_class, len);
|
||||
}
|
||||
|
||||
static jbyteArray JNICALL NewByteArray (JNIEnv *env, jsize len)
|
||||
{
|
||||
return (jbyteArray)new_java_array (env, mono_get_sbyte_class (), len);
|
||||
return (jbyteArray)new_java_array (env, mono_defaults.sbyte_class, len);
|
||||
}
|
||||
|
||||
static jcharArray JNICALL NewCharArray (JNIEnv *env, jsize len)
|
||||
{
|
||||
return (jcharArray)new_java_array (env, mono_get_char_class (), len);
|
||||
return (jcharArray)new_java_array (env, mono_defaults.char_class, len);
|
||||
}
|
||||
|
||||
static jshortArray JNICALL NewShortArray (JNIEnv *env, jsize len)
|
||||
{
|
||||
return (jshortArray)new_java_array (env, mono_get_int16_class (), len);
|
||||
return (jshortArray)new_java_array (env, mono_defaults.int16_class, len);
|
||||
}
|
||||
|
||||
static jintArray JNICALL NewIntArray (JNIEnv *env, jsize len)
|
||||
{
|
||||
return (jintArray)new_java_array (env, mono_get_int32_class (), len);
|
||||
return (jintArray)new_java_array (env, mono_defaults.int32_class, len);
|
||||
}
|
||||
|
||||
static jlongArray JNICALL NewLongArray (JNIEnv *env, jsize len)
|
||||
{
|
||||
return (jlongArray)new_java_array (env, mono_get_int64_class (), len);
|
||||
return (jlongArray)new_java_array (env, mono_defaults.int64_class, len);
|
||||
}
|
||||
|
||||
static jfloatArray JNICALL NewFloatArray (JNIEnv *env, jsize len)
|
||||
{
|
||||
return (jfloatArray)new_java_array (env, mono_get_single_class (), len);
|
||||
return (jfloatArray)new_java_array (env, mono_defaults.single_class, len);
|
||||
}
|
||||
|
||||
static jdoubleArray JNICALL NewDoubleArray (JNIEnv *env, jsize len)
|
||||
{
|
||||
return (jdoubleArray)new_java_array (env, mono_get_double_class (), len);
|
||||
return (jdoubleArray)new_java_array (env, mono_defaults.double_class, len);
|
||||
}
|
||||
|
||||
/* Original version with copy */
|
||||
|
||||
+2
-55
@@ -1,9 +1,8 @@
|
||||
.\"
|
||||
.\" mono-config configuration page.
|
||||
.\" mono configuration page.
|
||||
.\" (C) Ximian, Inc.
|
||||
.\" Author:
|
||||
.\" Miguel de Icaza ([email protected])
|
||||
.\" Paolo Molaro ([email protected])
|
||||
.\"
|
||||
.TH Mono "Mono 1.0"
|
||||
.SH NAME
|
||||
@@ -13,9 +12,6 @@ The Mono runtime will load configuration data from the
|
||||
installation prefix /etc/mono/config file, the ~/.mono/config or from
|
||||
the file pointed by the MONO_CONFIG environment variable.
|
||||
.PP
|
||||
For each assembly loaded a config file with the name:
|
||||
/path/to/the/assembly.exe.config is loaded, too.
|
||||
.PP
|
||||
This file controls the behavior of the runtime.
|
||||
.PP
|
||||
The file contains an XML-like file with various sections, all of them
|
||||
@@ -28,37 +24,6 @@ You use the dllmap directive to map shared libraries referenced by
|
||||
P/Invoke in your assemblies to a different shared library.
|
||||
.PP
|
||||
This is typically used to map Windows libraries to Unix library names.
|
||||
The
|
||||
.B dllmap
|
||||
element takes two attributes:
|
||||
.TP
|
||||
.I dll
|
||||
This should be the same string used in the DllImport attribute
|
||||
.TP
|
||||
.I target
|
||||
This should be the name of the library where the function can be found:
|
||||
this name should be suitable for use with the platform native shared library
|
||||
loading routines (dlopen etc.), so you may want to check the manpages for that, too.
|
||||
.SH <dllentry> directive
|
||||
This directive can be used to map a specific dll/function pair to a different
|
||||
library and also a different function name. It should appear inside a
|
||||
.B dllmap
|
||||
element with only the dll attribute specified.
|
||||
.PP
|
||||
The
|
||||
.B dllentry
|
||||
element takes 3 attributes:
|
||||
.TP
|
||||
.I dll
|
||||
This is the target library, where the function can be found.
|
||||
.TP
|
||||
.I name
|
||||
This is the name of the fuction as it appears in the metadata: it is the name
|
||||
of the P/Invoke method.
|
||||
.TP
|
||||
.I target
|
||||
This is the name of the function to lookup instead of the name specified in the
|
||||
P/Invoke method.
|
||||
.SH EXAMPLES
|
||||
The following example maps references to the `cygwin1.dll' shared
|
||||
library to the `libc.so.6' file.
|
||||
@@ -67,23 +32,5 @@ library to the `libc.so.6' file.
|
||||
<dllmap dll="cygwin1.dll" target="libc.so.6"/>
|
||||
</configuration>
|
||||
.fi
|
||||
.PP
|
||||
This one maps the following C# method:
|
||||
.nf
|
||||
[DllImport ("libc")]
|
||||
static extern void somefunction ();
|
||||
.fi
|
||||
to
|
||||
.B differentfunction
|
||||
in
|
||||
.B libdifferent.so.
|
||||
.nf
|
||||
<configuration>
|
||||
<dllmap dll="libc">
|
||||
<dllentry dll="libdifferent.so" name="somefunction" target="differentfunction" />
|
||||
</dllmap>
|
||||
</configuration>
|
||||
.fi
|
||||
|
||||
.SH SEE ALSO
|
||||
.BR mono(1), monodis(1), mint(1)
|
||||
.BR mono(1), monodis(1), mint(1)
|
||||
+27
-41
@@ -238,10 +238,10 @@ Finally, namespaces can be specified using the N: prefix:
|
||||
Turns off the garbage collection in Mono. This should be only used
|
||||
for debugging purposes
|
||||
.TP
|
||||
.I "MONO_ASPNET_NODELETE"
|
||||
If set to any value, temporary source files generated by ASP.NET support
|
||||
classes will not be removed. They will be kept in the user's temporary
|
||||
directory.
|
||||
.I "MONO_PATH"
|
||||
Provides a search path to the runtime where to look for library files.
|
||||
Directories are separated by the platform path separator (colons on unix). Example:
|
||||
.B /home/username/lib:/usr/local/mono/lib
|
||||
.TP
|
||||
.I "MONO_CFG_DIR"
|
||||
If set, this variable overrides the default system configuration directory
|
||||
@@ -252,21 +252,6 @@ If set, this variable overrides the default runtime configuration file
|
||||
($PREFIX/etc/mono/config). The --config command line options overrides the
|
||||
environment variable.
|
||||
.TP
|
||||
.I "MONO_LOG_LEVEL"
|
||||
If set, the logging level is changed to the set value. Possible values
|
||||
are "error", "critical", "warning", "message", "info", "debug". The
|
||||
default value is "error". Messages with a logging level greater then
|
||||
or equal to the log level will be printed to stdout/stderr.
|
||||
.TP
|
||||
.I "MONO_LOG_MASK"
|
||||
If set, the log mask is changed to the set value. Possible values are
|
||||
"asm" (assembly loader), "type", "dll" (native library loader), "gc"
|
||||
(garbage collector), "cfg" (config file loader), "all". The default value is
|
||||
"all". Changing the mask value allows you to display only messages for
|
||||
a certain component. You can use multiple masks by comma separating
|
||||
them. For example to see config file messages and assembly loader
|
||||
messages set you mask to "asm,cfg".
|
||||
.TP
|
||||
.I "MONO_DEBUG"
|
||||
If set, enables some features of the runtime useful for debugging.
|
||||
It makes the runtime display the stack traces for all the threads
|
||||
@@ -284,23 +269,33 @@ Windows I/O Emulation layer, and handles (files, events, mutexes,
|
||||
pipes) will not be shared across processes. Process creation is also
|
||||
disabled. This option is only available on Unix.
|
||||
.TP
|
||||
.I "MONO_EGD_SOCKET"
|
||||
For platforms that do not otherwise have a way of obtaining random bytes
|
||||
this can be set to the name of a file system socket on which an egd or
|
||||
prngd daemon is listening.
|
||||
.TP
|
||||
.I "MONO_EXTERNAL_ENCODINGS"
|
||||
If set, contains a colon-separated list of text encodings to try when
|
||||
turning externally-generated text (e.g. command-line arguments or
|
||||
filenames) into Unicode. The encoding names come from the list
|
||||
provided by iconv, and the special case "default_locale" which refers
|
||||
to the current locale's default encoding.
|
||||
.IP
|
||||
.TP
|
||||
When reading externally-generated text strings UTF-8 is tried first,
|
||||
and then this list is tried in order with the first successful
|
||||
conversion ending the search. When writing external text (e.g. new
|
||||
filenames or arguments to new processes) the first item in this list
|
||||
is used, or UTF-8 if the environment variable is not set.
|
||||
.TP
|
||||
.I "MONO_SHARED_DIR"
|
||||
If set its the directory where the ".wapi" handle state is stored.
|
||||
This is the directory where the Windows I/O Emulation layer stores its
|
||||
shared state data (files, events, mutexes, pipes). By default Mono
|
||||
will store the ".wapi" directory in the users's home directory.
|
||||
.TP
|
||||
.I "MONO_UNMANAGED_XSLT"
|
||||
If set any value, System.Xml.Xsl.XslTransform uses libxslt-based
|
||||
transformation engine (a.k.a Unmanaged XSLT). Unmanaged XSLT has
|
||||
long been used for XSLT engine while Managed XSLT engine is so
|
||||
new and might have some bugs. Basically we recommend Managed XSLT
|
||||
solution, but if it contains some blocking bugs, then you can also
|
||||
use traditional libxslt. If you want to use msxsl:script, you have
|
||||
to select Managed XSLT.
|
||||
.TP
|
||||
.I "MONO_MANAGED_WATCHER"
|
||||
If set to any value, System.IO.FileSystemWatcher will use the default
|
||||
@@ -308,23 +303,14 @@ managed implementation (slow). If unset, mono will try to use FAM under
|
||||
Unix systems and native API calls on Windows, falling back to the
|
||||
managed implementation on error.
|
||||
.TP
|
||||
.I "MONO_PATH"
|
||||
Provides a search path to the runtime where to look for library files.
|
||||
Directories are separated by the platform path separator (colons on unix). Example:
|
||||
.B /home/username/lib:/usr/local/mono/lib
|
||||
.I "MONO_CODEDOM_NODELETE"
|
||||
If set to any value, the C# CodeDom compiler will not remove the temporary
|
||||
source files generated.
|
||||
.TP
|
||||
.I "MONO_GAC_PREFIX"
|
||||
Provides a prefix the runtime uses to look for Global Assembly Caches.
|
||||
Directories are separated by the platform path separator (colons on
|
||||
unix). MONO_GAC_PREFIX should point to the top directory of a prefixed
|
||||
install. Or to the directory provided in the gacutil /gacdir command. Example:
|
||||
.B /home/username/.mono:/usr/local/mono/
|
||||
.TP
|
||||
.I "MONO_SHARED_DIR"
|
||||
If set its the directory where the ".wapi" handle state is stored.
|
||||
This is the directory where the Windows I/O Emulation layer stores its
|
||||
shared state data (files, events, mutexes, pipes). By default Mono
|
||||
will store the ".wapi" directory in the users's home directory.
|
||||
.I "MONO_EGD_SOCKET"
|
||||
For platforms that do not otherwise have a way of obtaining random bytes
|
||||
this can be set to the name of a file system socket on which an egd or
|
||||
prngd daemon is listening.
|
||||
.SH FILES
|
||||
On Unix assemblies are loaded from the installation lib directory. If you set
|
||||
`prefix' to /usr, the assemblies will be located in /usr/lib. On
|
||||
|
||||
@@ -1,9 +1,8 @@
|
||||
.\"
|
||||
.\" sn manual page.
|
||||
.\" Copyright 2003 Motus Technologies
|
||||
.\" Copyright 2004 Novell
|
||||
.\" Author:
|
||||
.\" Sebastien Pouliot <sebastien@ximian.com>
|
||||
.\" Sebastien Pouliot (spouliot@motus.com)
|
||||
.\"
|
||||
.TH Mono "sn"
|
||||
.SH NAME
|
||||
@@ -14,33 +13,24 @@ sn \- Digitally sign/verify/compare strongname on CLR assemblies.
|
||||
.SH DESCRIPTION
|
||||
Digitally sign, verify or compare, CLR assemblies using strongnames.
|
||||
.SH CONFIGURATION OPTIONS
|
||||
Configuration options are stored in the machine.config configuration file
|
||||
under /configuration/strongNames.
|
||||
.TP
|
||||
.I "-c provider"
|
||||
Change the default CSP (Crypto Service Provider). Currently not supported
|
||||
in Mono.
|
||||
Change the default CSP (Crypto Service Provider).
|
||||
.TP
|
||||
.I "-m [y|n]"
|
||||
Use a machine [y] key container or a user [n] key container. Currently not
|
||||
supported in Mono.
|
||||
Use a machine [y] key container or a user [n] key container.
|
||||
.TP
|
||||
.I "-Vl"
|
||||
List the verification options. The list is kept under /configuration/
|
||||
strongNames/verificationSettings in machine.config.
|
||||
List the verification options.
|
||||
.TP
|
||||
.I "-Vr assembly [userlist]"
|
||||
Exempt the specified assembly from verification for the specified user list.
|
||||
Currently not supported by sn, you must edit machine.config manually if you
|
||||
require this.
|
||||
.TP
|
||||
.I "-Vu assembly"
|
||||
Remove the exemption entry for the specified assembly. Currently not
|
||||
supported by sn, you must edit machine.config manually if you require this.
|
||||
Remove the exemption entry for the specified assembly.
|
||||
.TP
|
||||
.I "-Vx"
|
||||
Remove all exemptions entries. Currently not supported by sn, you must edit
|
||||
machine.config manually if you require this.
|
||||
Remove all exemptions entries.
|
||||
.SH CSP RELATED OPTIONS
|
||||
.TP
|
||||
.I "-d container"
|
||||
@@ -72,14 +62,11 @@ Compare if assembly1 and assembly are the same exception for their signature.
|
||||
This is done by comparing the hash of the metadata of both assembly.
|
||||
.TP
|
||||
.I "-k keypair.snk"
|
||||
Create a new strongname keypair (a 1024 bits RSA keypair) in the specified
|
||||
file.
|
||||
Create a new strongname keypair in the specified file.
|
||||
.TP
|
||||
.I "-R assembly keypair.snk"
|
||||
Resign the specified assembly using the specified strongname keypair file
|
||||
(SNK). You can only sign an assembly with the private key (SNK) that match
|
||||
the public key inside the assembly (unless it's public key token has been
|
||||
remapped in machine.config).
|
||||
(SNK).
|
||||
.TP
|
||||
.I "-Rc assembly container"
|
||||
Resign the specified assembly using the specified strongname container.
|
||||
@@ -96,10 +83,10 @@ Show the public key from the specified assembly.
|
||||
.I "-Tp assembly"
|
||||
Show the public key and the public key token from the specified assembly.
|
||||
.TP
|
||||
.I "-v assembly"
|
||||
.I "-V assembly"
|
||||
Verify the specified assembly signature.
|
||||
.TP
|
||||
.I "-vf assembly"
|
||||
.I "-Vf assembly"
|
||||
Verify the specified assembly signature (even if disabled).
|
||||
.SH HELP OPTIONS
|
||||
.TP
|
||||
@@ -117,35 +104,10 @@ Display convertion related help about this tool.
|
||||
.TP
|
||||
.I "-h sn", "-? sn"
|
||||
Display strongname related help about this tool.
|
||||
.SH CONFIGURATION FILE
|
||||
.TP
|
||||
Strongnames configuration is kept in "machine.config" file. Currently two
|
||||
features can be configured.
|
||||
.TP
|
||||
.I "/configuration/strongNames/pubTokenMapping"
|
||||
This mechanism let Mono remap a public key token, like the ECMA token, to
|
||||
another public key for verification. This is useful in two scenarios. First
|
||||
assemblies signed with the "ECMA key" needs to be verified by the "runtime"
|
||||
key (as the ECMA key isn't a public key). Second, many assemblies are signed
|
||||
with private keys that Mono can't use (e.g. System.Security.dll assembly).
|
||||
A new key cannot be used because it should change thr strongname (a new key
|
||||
pair would have a new public key which would produce a new token). Public
|
||||
key token remapping is the solution for both problems. Each token must be
|
||||
configured in a "map" entry similar to this one: <map Token="b77a5c561934e089"
|
||||
PublicKey="00..." />
|
||||
.TP
|
||||
.I "/configuration/strongNames/verificationSettings"
|
||||
It is often useful during development to use delay signed assemblies.
|
||||
Normally* the runtime wouldn't allow delay-signed assemblies to be loaded.
|
||||
This feature allows some delay-signed assemblies (based on their public key
|
||||
token, optionally assembly name and user name) to be used like they were
|
||||
fully signed assemblies. [*] Note that Mono 1.0 "runtime" doesn't validate
|
||||
strongname signatures so this option shouldn't be required in most scenarios.
|
||||
.SH AUTHOR
|
||||
Written by Sebastien Pouliot
|
||||
.SH COPYRIGHT
|
||||
Copyright (C) 2003 Motus Technologies.
|
||||
Copyright (C) 2004 Novell.
|
||||
Released under BSD license.
|
||||
.SH MAILING LISTS
|
||||
Visit http://mail.ximian.com/mailman/mono-list for details.
|
||||
|
||||
@@ -50,7 +50,7 @@ Specifies the namespace of the XML schema element for which a class or a dataset
|
||||
Specifies the programming language to use for the generated code. The only supported languages are CS (C#) and VB (Visual Basic.NET).
|
||||
.TP
|
||||
.I "/generator:type,assembly" "/g:type,assembly"
|
||||
Indicates xsd.exe to use custom CodeDomProvider to generate code. The type name must be full name. Assembly name is a local file name that is going to be loaded. The specified Type must have the default constructor.
|
||||
Indicates xsd.exe to use custom CodeDomProvider to generate code. Type name must be full name. Assembly name is file name that xsd.exe tries to load.
|
||||
.TP
|
||||
.I "/outputdir:path" "/o:path"
|
||||
Specifies the directory where to generate the code or schemas.
|
||||
|
||||
@@ -1,19 +1,3 @@
|
||||
2004-06-22 Todd Berman <[email protected]>
|
||||
|
||||
* configure: Patch from Mariano Suárez-Alvarez
|
||||
<[email protected]> to make configure accept jhbuild style
|
||||
/prefix /usr options, and to continue past unknown options. Currently
|
||||
this patch is a bit spammy with multiple unknown options, anyone
|
||||
who is interested is welcome to fix this.
|
||||
|
||||
2004-06-14 Raja R Harinath <[email protected]>
|
||||
|
||||
* Makefile (all-profiles, clean-profiles): Simplify slightly.
|
||||
|
||||
2004-06-05 Atsushi Enomoto <[email protected]>
|
||||
|
||||
* Makefile: added target run-test-ondotnet.
|
||||
|
||||
2004-05-26 Raja R Harinath <[email protected]>
|
||||
|
||||
* nunit20/util/Makefile (EXTRA_DISTFILES): Remove
|
||||
|
||||
+4
-6
@@ -19,19 +19,17 @@ test: platform-check profile-check test-recursive #test-local
|
||||
|
||||
run-test: run-test-recursive #run-test-local
|
||||
|
||||
run-test-ondotnet: run-test-ondotnet-recursive # run-test-ondotnet-local
|
||||
|
||||
clean: clean-recursive #clean-local
|
||||
|
||||
# fun specialty targets
|
||||
|
||||
all-profiles:
|
||||
$(MAKE) PROFILE=default all
|
||||
$(MAKE) PROFILE=net_2_0 all
|
||||
$(MAKE) PROFILE=default all || exit 1 ; \
|
||||
$(MAKE) PROFILE=net_2_0 all || exit 1 ;
|
||||
|
||||
clean-profiles:
|
||||
$(MAKE) PROFILE=default clean
|
||||
$(MAKE) PROFILE=net_2_0 clean
|
||||
$(MAKE) PROFILE=default clean || exit 1 ; \
|
||||
$(MAKE) PROFILE=net_2_0 clean || exit 1 ;
|
||||
|
||||
testcorlib:
|
||||
@cd class/corlib && $(MAKE) test run-test
|
||||
|
||||
+7
-12
@@ -1,12 +1,7 @@
|
||||
2004-06-11 Anirban Bhattacharjee <banirban@novell.com>
|
||||
* Makefile: Removed inclusion of rules.make from Makefile for two reasons :
|
||||
- This Makefile as of now has no dependency on rules.make what so ever
|
||||
- Because of inclusion of INTENAL_MBAS in rules.make it was causing confliction with existing INTERNAL_MBAS in this makefile and causing lots of tests to fail
|
||||
|
||||
2004-05-15 Rafael Teixeira ([email protected])
|
||||
* Makefile: corrected /libpath: compiler flag (parameter) to point to ../class/lib/default/ the new location of libraries
|
||||
|
||||
2004-03-16 Rafael Teixeira ([email protected])
|
||||
* Test1.vb: corrected mispelling in keyword
|
||||
* Test.Sources: no misc1.vb or CharacterLiteralsA.vb sources
|
||||
* ConditionalCompilationC.vb: added some tests with #Const
|
||||
2004-05-15 Rafael Teixeira (rafaelteixeira@hotmail.com)
|
||||
* Makefile: corrected /libpath: compiler flag (parameter) to point to ../class/lib/default/ the new location of libraries
|
||||
|
||||
2004-03-16 Rafael Teixeira ([email protected])
|
||||
* Test1.vb: corrected mispelling in keyword
|
||||
* Test.Sources: no misc1.vb or CharacterLiteralsA.vb sources
|
||||
* ConditionalCompilationC.vb: added some tests with #Const
|
||||
+7
-12
@@ -1,12 +1,7 @@
|
||||
2004-06-11 Anirban Bhattacharjee <banirban@novell.com>
|
||||
* Makefile: Removed inclusion of rules.make from Makefile for two reasons :
|
||||
- This Makefile as of now has no dependency on rules.make what so ever
|
||||
- Because of inclusion of INTENAL_MBAS in rules.make it was causing confliction with existing INTERNAL_MBAS in this makefile and causing lots of tests to fail
|
||||
|
||||
2004-05-15 Rafael Teixeira ([email protected])
|
||||
* Makefile: corrected /libpath: compiler flag (parameter) to point to ../class/lib/default/ the new location of libraries
|
||||
|
||||
2004-03-16 Rafael Teixeira ([email protected])
|
||||
* Test1.vb: corrected mispelling in keyword
|
||||
* Test.Sources: no misc1.vb or CharacterLiteralsA.vb sources
|
||||
* ConditionalCompilationC.vb: added some tests with #Const
|
||||
2004-05-15 Rafael Teixeira (rafaelteixeira@hotmail.com)
|
||||
* Makefile: corrected /libpath: compiler flag (parameter) to point to ../class/lib/default/ the new location of libraries
|
||||
|
||||
2004-03-16 Rafael Teixeira ([email protected])
|
||||
* Test1.vb: corrected mispelling in keyword
|
||||
* Test.Sources: no misc1.vb or CharacterLiteralsA.vb sources
|
||||
* ConditionalCompilationC.vb: added some tests with #Const
|
||||
@@ -1,34 +0,0 @@
|
||||
Imports System
|
||||
|
||||
Module M
|
||||
Delegate Sub SD()
|
||||
sub f()
|
||||
End sub
|
||||
|
||||
Public Delegate Function SF(a as integer) as Integer
|
||||
Public Function f1(a as integer) as Integer
|
||||
return a
|
||||
End Function
|
||||
|
||||
Sub Main()
|
||||
dim d1 as SD
|
||||
d1 = new SD(AddressOf f)
|
||||
d1.Invoke()
|
||||
|
||||
dim d2 as SD
|
||||
d2 = AddressOf f
|
||||
d2.Invoke()
|
||||
|
||||
dim d3 as new SD(AddressOf f)
|
||||
d3.Invoke()
|
||||
|
||||
dim d4 as SF
|
||||
d4 = new SF(AddressOf f1)
|
||||
Dim i as Integer = d4.Invoke(10)
|
||||
if i <> 10 then
|
||||
Throw new System.Exception ("#A1, Unexpected result")
|
||||
end if
|
||||
|
||||
|
||||
End Sub
|
||||
End Module
|
||||
@@ -1,14 +0,0 @@
|
||||
Imports System
|
||||
|
||||
Module M
|
||||
Delegate Sub SD()
|
||||
sub f(i as integer)
|
||||
End sub
|
||||
|
||||
|
||||
Sub Main()
|
||||
dim d1 as SD
|
||||
d1= new SD(AddressOf f)
|
||||
d1.Invoke()
|
||||
End Sub
|
||||
End Module
|
||||
@@ -1,18 +0,0 @@
|
||||
Imports System
|
||||
|
||||
Module M
|
||||
Delegate Sub SD()
|
||||
sub f()
|
||||
End sub
|
||||
|
||||
Public Delegate Function SF(a as integer) as Integer
|
||||
Public Function f1(a as integer) as Integer
|
||||
return a
|
||||
End Function
|
||||
|
||||
Sub Main()
|
||||
dim d1 as SD
|
||||
d1= new SD(AddressOf f1)
|
||||
d1.Invoke()
|
||||
End Sub
|
||||
End Module
|
||||
@@ -1,27 +0,0 @@
|
||||
Imports System
|
||||
|
||||
Class C
|
||||
Public Event E
|
||||
|
||||
Public Sub S()
|
||||
RaiseEvent E
|
||||
End Sub
|
||||
End Class
|
||||
|
||||
Class C1
|
||||
dim WithEvents x as C = new C()
|
||||
Sub call_S()
|
||||
x.S()
|
||||
End Sub
|
||||
|
||||
Sub EH() Handles x.E
|
||||
Console.WriteLine("event called")
|
||||
End Sub
|
||||
End Class
|
||||
|
||||
Module M
|
||||
Sub Main()
|
||||
dim y as new C1
|
||||
y.call_S()
|
||||
End Sub
|
||||
End Module
|
||||
@@ -1,28 +0,0 @@
|
||||
Imports System
|
||||
|
||||
Class C
|
||||
Delegate Sub EH()
|
||||
Public Event E as EH
|
||||
|
||||
Public Sub S()
|
||||
RaiseEvent E
|
||||
End Sub
|
||||
End Class
|
||||
|
||||
Class C1
|
||||
dim WithEvents x as C = new C()
|
||||
Sub call_S()
|
||||
x.S()
|
||||
End Sub
|
||||
|
||||
Sub EH() Handles x.E
|
||||
Console.WriteLine("event called")
|
||||
End Sub
|
||||
End Class
|
||||
|
||||
Module M
|
||||
Sub Main()
|
||||
dim y as new C1
|
||||
y.call_S()
|
||||
End Sub
|
||||
End Module
|
||||
@@ -1,30 +0,0 @@
|
||||
Imports System
|
||||
|
||||
Class C
|
||||
Public Event E (ByVal i as integer)
|
||||
|
||||
Public Sub S()
|
||||
RaiseEvent E(10)
|
||||
End Sub
|
||||
End Class
|
||||
|
||||
Class C1
|
||||
dim WithEvents x as C = new C()
|
||||
|
||||
Sub call_S()
|
||||
x.S()
|
||||
End Sub
|
||||
|
||||
Sub EH(i as Integer) Handles x.E
|
||||
Console.WriteLine("event called : " + i)
|
||||
End Sub
|
||||
End Class
|
||||
|
||||
Module M
|
||||
Sub Main()
|
||||
dim y as new C1
|
||||
y.call_S()
|
||||
End Sub
|
||||
End Module
|
||||
|
||||
|
||||
@@ -1,31 +0,0 @@
|
||||
Imports System
|
||||
|
||||
Class C
|
||||
Delegate Sub EH(ByVal i as integer)
|
||||
Public Event E as EH
|
||||
|
||||
Public Sub S()
|
||||
RaiseEvent E(10)
|
||||
End Sub
|
||||
End Class
|
||||
|
||||
Class C1
|
||||
dim WithEvents x as C = new C()
|
||||
|
||||
Sub call_S()
|
||||
x.S()
|
||||
End Sub
|
||||
|
||||
Sub EH(i as Integer) Handles x.E
|
||||
Console.WriteLine("event called : " + i)
|
||||
End Sub
|
||||
End Class
|
||||
|
||||
Module M
|
||||
Sub Main()
|
||||
dim y as new C1
|
||||
y.call_S()
|
||||
End Sub
|
||||
End Module
|
||||
|
||||
|
||||
@@ -1,28 +0,0 @@
|
||||
Imports System
|
||||
|
||||
Public Class C
|
||||
Public Event E()
|
||||
|
||||
Sub S()
|
||||
RaiseEvent E()
|
||||
End Sub
|
||||
End Class
|
||||
|
||||
|
||||
Module M
|
||||
Sub S1()
|
||||
Dim x As New C()
|
||||
AddHandler x.E, AddressOf EH
|
||||
x.S()
|
||||
End Sub
|
||||
|
||||
Sub EH()
|
||||
Console.WriteLine("Event fired")
|
||||
End Sub
|
||||
|
||||
Sub Main()
|
||||
S1()
|
||||
End Sub
|
||||
|
||||
End Module
|
||||
|
||||
@@ -1,30 +0,0 @@
|
||||
Imports System
|
||||
|
||||
Class C
|
||||
Delegate Sub EH()
|
||||
Public Event E as EH
|
||||
|
||||
Public Sub S()
|
||||
RaiseEvent E
|
||||
End Sub
|
||||
End Class
|
||||
|
||||
Class C1
|
||||
Sub call_S()
|
||||
dim x as C = new C()
|
||||
AddHandler x.E, AddressOf xh
|
||||
x.S()
|
||||
End Sub
|
||||
|
||||
Sub xh()
|
||||
Console.WriteLine("event called")
|
||||
End Sub
|
||||
End Class
|
||||
|
||||
Module M
|
||||
Sub Main()
|
||||
dim y as new C1
|
||||
y.call_S()
|
||||
End Sub
|
||||
|
||||
End Module
|
||||
+1
-4
@@ -6,10 +6,7 @@ INTERNAL_MBAS = $(TEST_RUNTIME) --debug ../mbas/mbas.exe --stacktrace $(COMPILER
|
||||
#INTERNAL_MBAS = vbc $(COMPILER_FLAGS)
|
||||
all: test-compiler-jit
|
||||
|
||||
# removed this cause INTERNAL_MBAS now getting set in
|
||||
# rules.make which is conflicting with this instance of
|
||||
# INTERNAL_MBAS
|
||||
#include ../build/rules.make
|
||||
include ../build/rules.make
|
||||
|
||||
DISTFILES = README.tests $(wildcard *.vb)
|
||||
|
||||
|
||||
@@ -1,21 +0,0 @@
|
||||
Imports system
|
||||
|
||||
Module M
|
||||
private i as integer
|
||||
|
||||
protected Property p() as Integer
|
||||
GET
|
||||
return i
|
||||
END GET
|
||||
|
||||
SET (val as Integer)
|
||||
i = val
|
||||
End SET
|
||||
|
||||
End Property
|
||||
|
||||
|
||||
Sub Main()
|
||||
End Sub
|
||||
|
||||
End Module
|
||||
@@ -1,17 +0,0 @@
|
||||
Class C1
|
||||
'property that do not override any other
|
||||
'property should not be declared 'notoverridable'
|
||||
|
||||
Public NotOverridable Property p() as Integer
|
||||
GET
|
||||
END GET
|
||||
|
||||
SET (val as Integer)
|
||||
End SET
|
||||
End Property
|
||||
|
||||
End Class
|
||||
Module OverrideC2
|
||||
Sub Main()
|
||||
End Sub
|
||||
End Module
|
||||
@@ -1,19 +0,0 @@
|
||||
Imports system
|
||||
|
||||
Module M
|
||||
private i as integer
|
||||
|
||||
public WriteOnly Property p() as Integer
|
||||
GET
|
||||
return i
|
||||
END GET
|
||||
|
||||
SET (ByVal val as Integer)
|
||||
i = val
|
||||
End SET
|
||||
End Property
|
||||
|
||||
Sub Main()
|
||||
End Sub
|
||||
|
||||
End Module
|
||||
@@ -1,19 +0,0 @@
|
||||
Imports system
|
||||
|
||||
Module M
|
||||
private i as integer
|
||||
|
||||
public ReadOnly Property p() as Integer
|
||||
GET
|
||||
return i
|
||||
END GET
|
||||
|
||||
SET (ByVal val as Integer)
|
||||
i = val
|
||||
End SET
|
||||
End Property
|
||||
|
||||
Sub Main()
|
||||
End Sub
|
||||
|
||||
End Module
|
||||
@@ -1,11 +0,0 @@
|
||||
Imports system
|
||||
|
||||
Module M
|
||||
private i as integer
|
||||
|
||||
public MustOverride Property p() as Integer
|
||||
|
||||
Sub Main()
|
||||
End Sub
|
||||
|
||||
End Module
|
||||
@@ -1,15 +0,0 @@
|
||||
Imports system
|
||||
|
||||
Public Struct s
|
||||
public MustOverride Property p() as Integer
|
||||
End Struct
|
||||
|
||||
|
||||
Module M
|
||||
private i as integer
|
||||
|
||||
|
||||
Sub Main()
|
||||
End Sub
|
||||
|
||||
End Module
|
||||
@@ -1,22 +0,0 @@
|
||||
Imports system
|
||||
|
||||
Structure S
|
||||
private i as integer
|
||||
|
||||
protected Property p() as Integer
|
||||
GET
|
||||
return i
|
||||
END GET
|
||||
|
||||
SET (val as Integer)
|
||||
i = val
|
||||
End SET
|
||||
|
||||
End Property
|
||||
End Structure
|
||||
|
||||
Module M
|
||||
Sub Main()
|
||||
End Sub
|
||||
|
||||
End Module
|
||||
+2
-18
@@ -132,14 +132,7 @@ PropertyA \
|
||||
PropertyB \
|
||||
PropertyC \
|
||||
PropertyD \
|
||||
PropertyE \
|
||||
DelegateA \
|
||||
EventA \
|
||||
EventB \
|
||||
EventC \
|
||||
EventD \
|
||||
EventE \
|
||||
EventF
|
||||
PropertyE
|
||||
|
||||
# All negetive test cases which should
|
||||
# fail during compilation goes here
|
||||
@@ -288,16 +281,7 @@ EnumC7 \
|
||||
PropertyC1 \
|
||||
PropertyC2 \
|
||||
PropertyC3 \
|
||||
PropertyC4 \
|
||||
PropertyC5 \
|
||||
PropertyC6 \
|
||||
PropertyC7 \
|
||||
PropertyC8 \
|
||||
PropertyC9 \
|
||||
PropertyC10 \
|
||||
PropertyC11 \
|
||||
DelegateC1 \
|
||||
DelegateC2
|
||||
PropertyC4
|
||||
|
||||
# All negetive test cases which should fail at
|
||||
# runtime goes here
|
||||
|
||||
@@ -1,129 +1,3 @@
|
||||
2004-06-21 Raja R Harinath <[email protected]>
|
||||
|
||||
* executable.make ($(PROGRAM)): Move depend on the makefrags ...
|
||||
(all-local): ... here.
|
||||
* library.make ($(the_lib), $(test_lib), $(btest_lib), all-local):
|
||||
Likewise.
|
||||
(LIBRARY_SNK): New default define. Allows library to be signed
|
||||
with a key other than mono.snk.
|
||||
($(the_lib_signature_stamp)): New stamp file created when an
|
||||
assembly is signed.
|
||||
(install-local, uninstall-local, maybe-sign-lib): Set MONO_PATH.
|
||||
|
||||
2004-06-16 Raja R Harinath <[email protected]>
|
||||
|
||||
* library.make ($(makefrag),$(test_makefrag),$(btest_makefrag)):
|
||||
Depend on library.make.
|
||||
* executable.make ($(makefrag)): Depend on executable.make.
|
||||
|
||||
2004-06-16 Atsushi Enomoto <[email protected]>
|
||||
|
||||
* library.make : Added GACDIR. Use cygpath -w on windows.
|
||||
|
||||
2004-06-14 Raja R Harinath <[email protected]>
|
||||
|
||||
* platforms/linux.make (PLATFORM_CHANGE_SEPARATOR_CMD): Define to 'cat'.
|
||||
(PLATFORM_TWEAK_CORLIB_SOURCES): Remove.
|
||||
(platform-check): Avoid bash-ism.
|
||||
* library.make: Simplify uses of $(patsubst x,y,$(foo)) to $(foo:x=y).
|
||||
(core_sourcefile): Rename back to ...
|
||||
(sourcefile): ... this. Remove creation of redundant intermediate file.
|
||||
(response): Change test for optimization, now that
|
||||
PLATFORM_CHANGE_SEPARATOR_CMD is unconditional. Combine with
|
||||
platform-exclude handling.
|
||||
(library_CLEAN_FILES): New variable to specify clean:-able files
|
||||
close to where they're defined.
|
||||
(test_response, btest_response): Simplify.
|
||||
* executable.make (response): Change test for optimization.
|
||||
(executable_CLEAN_FILES): New define.
|
||||
|
||||
2004-06-14 Raja R Harinath <[email protected]>
|
||||
|
||||
* library.make (uninstall-local): Fix typo.
|
||||
|
||||
2004-06-11 Atsushi Enomoto <[email protected]>
|
||||
|
||||
* library.make : HAVE_CS_TESTS fixie.
|
||||
|
||||
2004-06-11 Raja R Harinath <[email protected]>
|
||||
|
||||
* library.make (HAVE_CS_TESTS, HAVE_VB_TESTS): Allow to be
|
||||
overriden. Useful if the tests sourcefile is generated.
|
||||
(TEST_COMPILE, BTEST_COMPILE): Allow these to be customized too.
|
||||
|
||||
* platforms/win32.make (PLATFORM_TWEAK_CORLIB_SOURCES): Remove.
|
||||
|
||||
Support enough features to build mscorlib.dll.
|
||||
* library.make (core_sourcefile): New renamed from $(sourcefile).
|
||||
(PLATFORM_excludes): Auto-detecting define that sees if
|
||||
$(LIBRARY).$(PLATFORM)-excludes file exists.
|
||||
(sourcefile): New. Possibly-built file that removes
|
||||
PLATFORM_excluded files from core_sourcefile.
|
||||
(test_against, test_dep): New. Allow the test assembly to be
|
||||
built against a different library.
|
||||
(test_lib): Allow makefile to override the name of the test
|
||||
assembly.
|
||||
(LIBRARY_INSTALL_DIR): If defined, switch to using $(INSTALL_LIB)
|
||||
rather than $(gacutil).
|
||||
(DISTFILES, dist-local): Use core_sourcefile.
|
||||
(clean-local): Remove sourcefile if it was generated.
|
||||
(test_lib, btest_lib): Depend on $(test_dep).
|
||||
|
||||
2004-06-10 Gonzalo Paniagua Javier <[email protected]>
|
||||
|
||||
* library.make: fixed PLATFORM_CHANGE_SEPARATOR_CHAR on windows.
|
||||
|
||||
2004-06-09 Sebastien Pouliot <[email protected]>
|
||||
|
||||
* library.make: Added support to fully sign assemblies when doing a
|
||||
"make install" (thanks to Jackson :-).
|
||||
|
||||
2004-06-09 Raja R Harinath <[email protected]>
|
||||
|
||||
Do away with stampfiles.
|
||||
Introduce support for VB test cases.
|
||||
* library.make (HAVE_CS_TESTS, HAVE_VB_TESTS): New auto-detecting
|
||||
defines.
|
||||
(stampfile, test_stampfile): Remove.
|
||||
(clean-local): Don't mention them.
|
||||
(test-local, run-test-local, run-test-ondotnet-local):
|
||||
Make unconditional.
|
||||
($(makefrag), $(test_makefrag)): Simplify.
|
||||
($(btest_lib)): New. Support for VB testcases.
|
||||
|
||||
2004-06-09 Raja R Harinath <[email protected]>
|
||||
|
||||
Partial support for writing Visual Basic source files.
|
||||
* rules.make (USE_MBAS_FLAGS,BASCOMPILE,INTERNAL_MBAS): New.
|
||||
* config-default.make (MBAS_FLAGS, DEFAULT_MBAS_FLAGS): New.
|
||||
* profiles/default.make (MBAS): New.
|
||||
|
||||
2004-06-09 Raja R Harinath <[email protected]>
|
||||
|
||||
Do away with stampfiles.
|
||||
* executable.make (stampfile): Remove.
|
||||
(clean-local): Remove mention of $(stampfile).
|
||||
(test-local, run-test-local, run-test-ondotnet-local):
|
||||
Make unconditional. Add dummy rule to prevent other makefiles
|
||||
from defining rules on these.
|
||||
($(PROGRAM)): Depend directly on $(BUILT_SOURCES).
|
||||
($(makefrag)): Simplify.
|
||||
|
||||
2004-06-03 Atsushi Enomoto <[email protected]>
|
||||
|
||||
* README.makefiles : added description for run-test-ondotnet.
|
||||
|
||||
2004-06-03 Atsushi Enomoto <[email protected]>
|
||||
|
||||
* Makefile, executable.make, library.make, rules.make :
|
||||
Added new target "run-test-ondotnet" that works what "run-test"
|
||||
used to be on windows (i.e. tests our libs under MS.NET).
|
||||
|
||||
2004-06-01 Atsushi Enomoto <[email protected]>
|
||||
|
||||
* platforms/win32.make : TEST_RUNTIME should be always mono we can't
|
||||
test our libs against MS.NET runtime. Think about internal call).
|
||||
|
||||
2004-05-30 Jackson Harper <[email protected]>
|
||||
|
||||
* library.make: Install to 2.0 package if building with the
|
||||
|
||||
+1
-1
@@ -2,7 +2,7 @@ thisdir = build
|
||||
SUBDIRS =
|
||||
include ../build/rules.make
|
||||
|
||||
all-local install-local test-local run-test-local run-test-ondotnet-local clean-local uninstall-local:
|
||||
all-local install-local test-local run-test-local clean-local uninstall-local:
|
||||
|
||||
DISTFILES = \
|
||||
README.makefiles \
|
||||
|
||||
@@ -40,9 +40,6 @@ test-local: my_test_program.exe
|
||||
run-test-local:
|
||||
$(RUNTIME) my_test_program.exe
|
||||
|
||||
run-test-ondotnet-local:
|
||||
$(RUNTIME) my_test_program.exe
|
||||
|
||||
DISTFILES = myfile.txt my_test_source.cs
|
||||
|
||||
dist-local: dist-default
|
||||
@@ -52,7 +49,7 @@ my_test_program.exe: my_test_source.cs
|
||||
========================================
|
||||
|
||||
Each makefile follows the same pattern: it does some setup, includes
|
||||
the standard make rules, and provides rules for seven standard targets:
|
||||
the standard make rules, and provides rules for six standard targets:
|
||||
all, install, test, run-test, clean, and dist.
|
||||
|
||||
"Some setup" is defining two variables: $(thisdir) and
|
||||
@@ -60,7 +57,7 @@ $(SUBDIRS). $(thisdir) is the directory that the makefile lives in,
|
||||
relative to the top directory (ie, class/corlib) and $(SUBDIRS)
|
||||
defines the subdirectories that should be built in.
|
||||
|
||||
The seven targets do the following:
|
||||
The six targets do the following:
|
||||
|
||||
* all-local builds whatever someone would expect to be built
|
||||
when they just type 'make'. Most likely Foo.dll or Foo.exe
|
||||
@@ -78,8 +75,6 @@ target. The idea is that 'make run-test' from the toplevel should be
|
||||
able to proceed unsupervised and test everything that can be tested in
|
||||
such a manner.
|
||||
|
||||
* run-test-ondotnet-local is a variant of run-test-local. It is used only to validate if our tests themselves works fine under Microsoft runtime (on Windows). Basically, in this target, we should not use $(TEST_RUNTIME) to test our libraries.
|
||||
|
||||
* clean-local removes built files; 'make clean' should leave
|
||||
only files that go into a distribution tarball. (But it is not necessarily
|
||||
true that all files that go into a tarball need to be left after a make clean.)
|
||||
|
||||
@@ -9,7 +9,6 @@
|
||||
RUNTIME_FLAGS =
|
||||
TEST_HARNESS = $(topdir)/class/lib/nunit-console.exe
|
||||
MCS_FLAGS = $(PLATFORM_DEBUG_FLAGS)
|
||||
MBAS_FLAGS = $(PLATFORM_DEBUG_FLAGS)
|
||||
LIBRARY_FLAGS = /noconfig
|
||||
CFLAGS = -g -O2
|
||||
INSTALL = /usr/bin/install
|
||||
@@ -21,7 +20,6 @@ prefix = /usr/local
|
||||
# keep track of the default value
|
||||
|
||||
DEFAULT_MCS_FLAGS := $(MCS_FLAGS)
|
||||
DEFAULT_MBAS_FLAGS := $(MBAS_FLAGS)
|
||||
|
||||
# You shouldn't need to set these but might on a
|
||||
# weird platform.
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
*.makefrag
|
||||
*.response
|
||||
*.stamp
|
||||
*.was_signed
|
||||
+29
-18
@@ -8,17 +8,14 @@
|
||||
|
||||
base_prog = $(shell basename $(PROGRAM))
|
||||
sourcefile = $(base_prog).sources
|
||||
|
||||
ifeq (cat,$(PLATFORM_CHANGE_SEPARATOR_CMD))
|
||||
response = $(sourcefile)
|
||||
else
|
||||
ifdef PLATFORM_CHANGE_SEPARATOR_CMD
|
||||
response = $(depsdir)/$(base_prog).response
|
||||
executable_CLEAN_FILES += $(response)
|
||||
else
|
||||
response = $(sourcefile)
|
||||
endif
|
||||
|
||||
stampfile = $(depsdir)/$(base_prog).stamp
|
||||
makefrag = $(depsdir)/$(base_prog).makefrag
|
||||
pdb = $(patsubst %.exe,%.pdb,$(PROGRAM))
|
||||
executable_CLEAN_FILES += $(makefrag) $(pdb)
|
||||
|
||||
ifndef PROGRAM_INSTALL_DIR
|
||||
PROGRAM_INSTALL_DIR = $(prefix)/bin
|
||||
@@ -34,14 +31,16 @@ uninstall-local:
|
||||
-rm -f $(DESTDIR)$(PROGRAM_INSTALL_DIR)/$(base_prog)
|
||||
|
||||
clean-local:
|
||||
-rm -f *.exe $(BUILT_SOURCES) $(executable_CLEAN_FILES) $(CLEAN_FILES)
|
||||
-rm -f *.exe $(BUILT_SOURCES) $(CLEAN_FILES) $(pdb) $(stampfile) $(makefrag)
|
||||
ifdef PLATFORM_CHANGE_SEPARATOR_CMD
|
||||
-rm -f $(response)
|
||||
endif
|
||||
|
||||
ifndef HAS_TEST
|
||||
test-local: $(PROGRAM)
|
||||
@:
|
||||
|
||||
run-test-local:
|
||||
@:
|
||||
run-test-ondotnet-local:
|
||||
@:
|
||||
endif
|
||||
|
||||
DISTFILES = $(sourcefile) $(EXTRA_DISTFILES)
|
||||
|
||||
@@ -51,24 +50,36 @@ dist-local: dist-default
|
||||
$(MKINSTALLDIRS) $$dest && cp $$f $$dest || exit 1 ; \
|
||||
done
|
||||
|
||||
# Changing makefile probably means changing the
|
||||
# sources, so let's be safe and add a Makefile dep
|
||||
|
||||
ifndef PROGRAM_COMPILE
|
||||
PROGRAM_COMPILE = $(CSCOMPILE)
|
||||
endif
|
||||
|
||||
$(PROGRAM): $(BUILT_SOURCES) $(response)
|
||||
$(PROGRAM): $(makefrag) $(response) $(stampfile)
|
||||
$(PROGRAM_COMPILE) /target:exe /out:$@ $(BUILT_SOURCES) @$(response)
|
||||
|
||||
# warning: embedded tab in the 'echo touch' line
|
||||
$(makefrag): $(sourcefile)
|
||||
@echo Creating $@ ...
|
||||
@sed 's,^,$(PROGRAM): ,' $< > $@
|
||||
@echo "HAVE_MAKEFRAG = yes" >$@.new
|
||||
@echo "$(stampfile): $(BUILT_SOURCES) \\" >>[email protected]
|
||||
@cat $< |sed -e 's,\.cs[ \t]*$$,\.cs \\,' >>[email protected]
|
||||
@cat [email protected] |sed -e '$$s, \\$$,,' >$@
|
||||
@echo " touch \$$@" >>$@
|
||||
@rm -rf [email protected]
|
||||
|
||||
ifneq ($(response),$(sourcefile))
|
||||
ifdef PLATFORM_CHANGE_SEPARATOR_CMD
|
||||
$(response): $(sourcefile)
|
||||
@echo Creating $@ ...
|
||||
@( $(PLATFORM_CHANGE_SEPARATOR_CMD) ) <$< >$@
|
||||
@cat $< |$(PLATFORM_CHANGE_SEPARATOR_CMD) >$@
|
||||
endif
|
||||
|
||||
-include $(makefrag)
|
||||
|
||||
all-local: $(makefrag)
|
||||
$(makefrag): $(topdir)/build/executable.make
|
||||
ifndef HAVE_MAKEFRAG
|
||||
$(stampfile):
|
||||
touch $@
|
||||
endif
|
||||
|
||||
+68
-166
@@ -9,17 +9,10 @@
|
||||
# munge in the library name to keep the files from clashing.
|
||||
|
||||
sourcefile = $(LIBRARY).sources
|
||||
PLATFORM_excludes := $(wildcard $(LIBRARY).$(PLATFORM)-excludes)
|
||||
|
||||
ifndef PLATFORM_excludes
|
||||
ifeq (cat,$(PLATFORM_CHANGE_SEPARATOR_CMD))
|
||||
response = $(sourcefile)
|
||||
endif
|
||||
endif
|
||||
|
||||
ifndef response
|
||||
ifdef PLATFORM_CHANGE_SEPARATOR_CMD
|
||||
response = $(depsdir)/$(PROFILE)_$(LIBRARY).response
|
||||
library_CLEAN_FILES += $(response)
|
||||
else
|
||||
response = $(sourcefile)
|
||||
endif
|
||||
|
||||
ifndef LIBRARY_NAME
|
||||
@@ -27,53 +20,25 @@ LIBRARY_NAME = $(LIBRARY)
|
||||
endif
|
||||
|
||||
makefrag = $(depsdir)/$(PROFILE)_$(LIBRARY).makefrag
|
||||
stampfile = $(depsdir)/$(PROFILE)_$(LIBRARY).stamp
|
||||
the_lib = $(topdir)/class/lib/$(PROFILE)/$(LIBRARY_NAME)
|
||||
the_lib_signature_stamp = $(makefrag:.makefrag=.was_signed)
|
||||
the_pdb = $(the_lib:.dll=.pdb)
|
||||
library_CLEAN_FILES += $(makefrag) $(the_lib) $(the_pdb) $(the_lib_signature_stamp)
|
||||
the_pdb = $(patsubst %.dll,%.pdb,$(the_lib))
|
||||
|
||||
ifndef NO_TEST
|
||||
test_nunit_lib = nunit.framework.dll nunit.core.dll nunit.util.dll
|
||||
test_nunit_dep = $(test_nunit_lib:%=$(topdir)/class/lib/$(PROFILE)/%)
|
||||
test_nunit_ref = $(test_nunit_dep:%=-r:%)
|
||||
library_CLEAN_FILES += TestResult.xml
|
||||
|
||||
ifndef test_against
|
||||
test_against = $(the_lib)
|
||||
test_dep = $(the_lib)
|
||||
endif
|
||||
|
||||
ifndef test_lib
|
||||
test_lib = $(LIBRARY:.dll=_test.dll)
|
||||
endif
|
||||
test_pdb = $(test_lib:.dll=.pdb)
|
||||
test_lib = $(patsubst %.dll,%_test.dll,$(LIBRARY))
|
||||
test_pdb = $(patsubst %.dll,%.pdb,$(test_lib))
|
||||
test_sourcefile = $(test_lib).sources
|
||||
test_response = $(depsdir)/$(PROFILE)_$(test_lib).response
|
||||
test_makefrag = $(depsdir)/$(PROFILE)_$(test_lib).makefrag
|
||||
test_flags = /r:$(test_against) $(test_nunit_ref) $(TEST_MCS_FLAGS)
|
||||
library_CLEAN_FILES += $(test_lib) $(test_pdb) $(test_response) $(test_makefrag)
|
||||
|
||||
ifndef btest_lib
|
||||
btest_lib = $(LIBRARY:.dll=_btest.dll)
|
||||
endif
|
||||
btest_pdb = $(btest_lib:.dll=.pdb)
|
||||
btest_sourcefile = $(btest_lib).sources
|
||||
btest_response = $(depsdir)/$(btest_lib).response
|
||||
btest_makefrag = $(depsdir)/$(btest_lib).makefrag
|
||||
btest_flags = /r:$(test_against) $(test_nunit_ref) $(TEST_MBAS_FLAGS)
|
||||
library_CLEAN_FILES += $(btest_lib) $(btest_pdb) $(btest_response) $(btest_makefrag)
|
||||
|
||||
ifndef HAVE_CS_TESTS
|
||||
HAVE_CS_TESTS := $(wildcard $(test_sourcefile))
|
||||
endif
|
||||
ifndef HAVE_VB_TESTS
|
||||
HAVE_VB_TESTS := $(wildcard $(btest_sourcefile))
|
||||
endif
|
||||
|
||||
test_stampfile = $(depsdir)/$(PROFILE)_$(test_lib).stamp
|
||||
test_nunitfw = $(topdir)/class/lib/$(PROFILE)/nunit.framework.dll
|
||||
test_nunitcore = $(topdir)/class/lib/$(PROFILE)/nunit.core.dll
|
||||
test_nunitutil = $(topdir)/class/lib/$(PROFILE)/nunit.util.dll
|
||||
test_nunit_ref = -r:$(test_nunitfw) -r:$(test_nunitcore) -r:$(test_nunitutil)
|
||||
test_flags = /r:$(the_lib) $(test_nunit_ref) $(TEST_MCS_FLAGS)
|
||||
endif
|
||||
|
||||
gacutil = $(topdir)/tools/gacutil/gacutil.exe
|
||||
sn = $(topdir)/tools/security/sn.exe
|
||||
|
||||
PACKAGE = 1.0
|
||||
|
||||
@@ -81,110 +46,50 @@ ifeq ($(PROFILE), net_2_0)
|
||||
PACKAGE = 2.0
|
||||
endif
|
||||
|
||||
ifeq ($(PLATFORM), win32)
|
||||
GACDIR = `cygpath -w $(DESTDIR)$(prefix)/lib`
|
||||
else
|
||||
GACDIR = $(DESTDIR)$(prefix)/lib
|
||||
endif
|
||||
|
||||
all-local: $(the_lib)
|
||||
|
||||
install-local: $(the_lib)
|
||||
|
||||
ifdef LIBRARY_INSTALL_DIR
|
||||
install-local:
|
||||
$(MKINSTALLDIRS) $(DESTDIR)$(LIBRARY_INSTALL_DIR)
|
||||
$(INSTALL_LIB) $(the_lib) $(DESTDIR)$(LIBRARY_INSTALL_DIR)/$(LIBRARY_NAME)
|
||||
|
||||
uninstall-local:
|
||||
-rm -f $(DESTDIR)$(LIBRARY_INSTALL_DIR)/$(LIBRARY_NAME)
|
||||
|
||||
else
|
||||
|
||||
install-local: $(gacutil)
|
||||
MONO_PATH="$(topdir)/class/lib/$(PROFILE):$$MONO_PATH" $(RUNTIME) $(gacutil) /i $(the_lib) /f /root $(GACDIR) /package $(PACKAGE)
|
||||
install-local: $(the_lib) $(gacutil)
|
||||
$(RUNTIME) $(gacutil) /i $(the_lib) /f /root $(DESTDIR)$(prefix)/lib /package $(PACKAGE)
|
||||
|
||||
uninstall-local: $(gacutil)
|
||||
MONO_PATH="$(topdir)/class/lib/$(PROFILE):$$MONO_PATH" $(RUNTIME) $(gacutil) /u $(LIBRARY_NAME:.dll=)
|
||||
$(RUNTIME) $(gacutil) /u $$(basename $(the_lib) .dll) ; \
|
||||
|
||||
$(gacutil):
|
||||
cd $(topdir)/tools/gacutil && $(MAKE)
|
||||
|
||||
endif
|
||||
|
||||
ifndef NO_SIGN_ASSEMBLY
|
||||
install-local: $(the_lib_signature_stamp)
|
||||
|
||||
ifndef LIBRARY_SNK
|
||||
LIBRARY_SNK = $(topdir)/class/mono.snk
|
||||
endif
|
||||
|
||||
$(the_lib_signature_stamp): $(the_lib) $(sn)
|
||||
MONO_PATH="$(topdir)/class/lib/$(PROFILE):$$MONO_PATH" $(RUNTIME) $(sn) -q -R $(the_lib) $(LIBRARY_SNK)
|
||||
echo stamp > $@
|
||||
endif
|
||||
|
||||
$(sn):
|
||||
cd $(topdir)/tools/security && $(MAKE) sn.exe
|
||||
cd $(topdir)/tools/gacutil && $(MAKE) || exit 1 ;
|
||||
|
||||
clean-local:
|
||||
-rm -f $(library_CLEAN_FILES) $(CLEAN_FILES)
|
||||
|
||||
test-local: $(the_lib)
|
||||
@:
|
||||
run-test-local:
|
||||
@:
|
||||
run-test-ondotnet-local:
|
||||
@:
|
||||
|
||||
ifndef NO_TEST
|
||||
$(test_nunit_dep): $(topdir)/build/deps/nunit.stamp
|
||||
@if test -f $@; then :; else rm -f $<; $(MAKE) $<; fi
|
||||
$(topdir)/build/deps/nunit.stamp:
|
||||
cd ${topdir}/nunit20 && $(MAKE)
|
||||
echo "stamp" >$@
|
||||
-rm -f $(the_lib) $(makefrag) $(test_lib) \
|
||||
$(test_makefrag) $(test_response) \
|
||||
$(stampfile) $(test_stampfile) \
|
||||
$(the_pdb) $(test_pdb) $(CLEAN_FILES) \
|
||||
TestResult.xml
|
||||
ifdef PLATFORM_CHANGE_SEPARATOR_CMD
|
||||
-rm -rf $(response)
|
||||
endif
|
||||
|
||||
ifdef HAVE_CS_TESTS
|
||||
ifndef NO_TEST
|
||||
$(test_nunitfw):
|
||||
(cd ${topdir}/nunit20 && make)
|
||||
|
||||
test-local: $(test_lib)
|
||||
test-local: $(test_nunitfw) $(the_lib) $(test_lib)
|
||||
|
||||
run-test-local: run-test-lib
|
||||
|
||||
run-test-lib: test-local
|
||||
$(TEST_RUNTIME) $(TEST_HARNESS) $(test_lib)
|
||||
|
||||
run-test-ondotnet-local: run-test-ondotnet-lib
|
||||
|
||||
run-test-ondotnet-lib: test-local
|
||||
$(TEST_HARNESS) $(test_lib)
|
||||
endif
|
||||
|
||||
ifdef HAVE_VB_TESTS
|
||||
|
||||
test-local: $(btest_lib)
|
||||
|
||||
run-test-local: run-btest-lib
|
||||
|
||||
run-btest-lib: test-local
|
||||
$(TEST_RUNTIME) $(TEST_HARNESS) $(btest_lib)
|
||||
|
||||
run-test-ondotnet-local: run-btest-ondotnet-lib
|
||||
|
||||
run-btest-ondotnet-lib: test-local
|
||||
$(TEST_HARNESS) $(btest_lib)
|
||||
else
|
||||
test-local: $(the_lib)
|
||||
|
||||
run-test-local:
|
||||
endif
|
||||
|
||||
DISTFILES = $(sourcefile) $(test_sourcefile) $(EXTRA_DISTFILES)
|
||||
|
||||
ifdef NO_TEST
|
||||
TEST_FILES =
|
||||
|
||||
ifdef HAVE_CS_TESTS
|
||||
TEST_FILES += `sed 's,^,Test/,' $(test_sourcefile)`
|
||||
endif
|
||||
ifdef HAVE_VB_TESTS
|
||||
TEST_FILES += `sed 's,^,Test/,' $(btest_sourcefile)`
|
||||
else
|
||||
TEST_FILES = `cat $(test_sourcefile) |sed -e 's,^\(.\),Test/\1,'`
|
||||
endif
|
||||
|
||||
dist-local: dist-default
|
||||
@@ -197,67 +102,64 @@ ifndef LIBRARY_COMPILE
|
||||
LIBRARY_COMPILE = $(CSCOMPILE)
|
||||
endif
|
||||
|
||||
ifndef TEST_COMPILE
|
||||
TEST_COMPILE = $(CSCOMPILE)
|
||||
endif
|
||||
|
||||
ifndef BTEST_COMPILE
|
||||
BTEST_COMPILE = $(BASCOMPILE)
|
||||
endif
|
||||
|
||||
# Fun with dependency tracking
|
||||
|
||||
$(the_lib): $(response)
|
||||
$(the_lib): $(makefrag) $(stampfile) $(response)
|
||||
$(LIBRARY_COMPILE) $(LIBRARY_FLAGS) $(LIB_MCS_FLAGS) /target:library /out:$@ @$(response)
|
||||
|
||||
# warning: embedded tab in the 'echo touch' line
|
||||
$(makefrag): $(sourcefile)
|
||||
@echo Creating $@ ...
|
||||
@sed 's,^,$(the_lib): ,' $< >$@
|
||||
@echo "HAVE_MAKEFRAG = yes" >[email protected]
|
||||
@echo "$(stampfile): \\" >>[email protected]
|
||||
@cat $< |sed -e 's,\.cs[ \t]*$$,\.cs \\,' >>[email protected]
|
||||
@cat [email protected] |sed -e '$$s, \\$$,,' >$@
|
||||
@echo " touch \$$@" >>$@
|
||||
@rm -rf [email protected]
|
||||
|
||||
ifneq ($(response),$(sourcefile))
|
||||
$(response): $(sourcefile) $(PLATFORM_excludes)
|
||||
ifdef PLATFORM_CHANGE_SEPARATOR_CMD
|
||||
$(response): $(sourcefile)
|
||||
@echo Creating $@ ...
|
||||
@sort $(sourcefile) $(PLATFORM_excludes) | uniq -u | $(PLATFORM_CHANGE_SEPARATOR_CMD) >$@
|
||||
@cat $< |$(PLATFORM_CHANGE_SEPARATOR_CMD) >$@
|
||||
endif
|
||||
|
||||
-include $(makefrag)
|
||||
|
||||
ifndef HAVE_MAKEFRAG
|
||||
$(stampfile):
|
||||
touch $@
|
||||
endif
|
||||
|
||||
# for now, don't give any /lib flags or set MONO_PATH, since we
|
||||
# give a full path to the assembly.
|
||||
|
||||
ifdef HAVE_CS_TESTS
|
||||
|
||||
$(test_lib): $(test_dep) $(test_response) $(test_nunit_dep)
|
||||
$(TEST_COMPILE) /target:library /out:$@ $(test_flags) @$(test_response)
|
||||
ifndef NO_TEST
|
||||
$(test_lib): $(test_makefrag) $(the_lib) $(test_response) $(test_stampfile)
|
||||
$(CSCOMPILE) /target:library /out:$@ $(test_flags) @$(test_response)
|
||||
|
||||
$(test_response): $(test_sourcefile)
|
||||
@echo Creating $@ ...
|
||||
@sed 's,^,Test/,' $(test_sourcefile) | $(PLATFORM_CHANGE_SEPARATOR_CMD) >$@
|
||||
ifdef PLATFORM_CHANGE_SEPARATOR_CMD
|
||||
@cat $< |sed -e 's,^\(.\),Test/\1,' |$(PLATFORM_CHANGE_SEPARATOR_CMD) >$@
|
||||
else
|
||||
@cat $< |sed -e 's,^\(.\),Test/\1,' >$@
|
||||
endif
|
||||
|
||||
# warning: embedded tab in the 'echo touch' line
|
||||
$(test_makefrag): $(test_response)
|
||||
@echo Creating $@ ...
|
||||
@sed 's,^,$(test_lib): ,' $< >$@
|
||||
@echo "HAVE_TEST_MAKEFRAG = yes" >[email protected]
|
||||
@echo "$(test_stampfile): \\" >>[email protected]
|
||||
@cat $< |sed -e 's,\.cs[ \t]*$$,\.cs \\,' >>[email protected]
|
||||
@cat [email protected] |sed -e '$$s, \\$$,,' >$@
|
||||
@echo " touch \$$@" >>$@
|
||||
@rm -rf [email protected]
|
||||
|
||||
-include $(test_makefrag)
|
||||
|
||||
endif
|
||||
|
||||
ifdef HAVE_VB_TESTS
|
||||
|
||||
$(btest_lib): $(test_dep) $(btest_response) $(test_nunit_dep)
|
||||
$(BTEST_COMPILE) /target:library /out:$@ $(btest_flags) @$(btest_response)
|
||||
|
||||
$(btest_response): $(btest_sourcefile)
|
||||
@echo Creating $@ ...
|
||||
@sed 's,^,Test/,' $(btest_sourcefile) | $(PLATFORM_CHANGE_SEPARATOR_CMD) >$@
|
||||
|
||||
$(btest_makefrag): $(btest_response)
|
||||
@echo Creating $@ ...
|
||||
@sed 's,^,$(btest_lib): ,' $< >$@
|
||||
|
||||
-include $(btest_makefrag)
|
||||
|
||||
ifndef HAVE_TEST_MAKEFRAG
|
||||
$(test_stampfile):
|
||||
touch $@
|
||||
endif
|
||||
|
||||
all-local: $(makefrag) $(test_makefrag) $(btest_makefrag)
|
||||
$(makefrag) $(test_makefrag) $(btest_makefrag): $(topdir)/build/library.make
|
||||
@@ -16,20 +16,28 @@ PLATFORM_PATH_SEPARATOR = :
|
||||
# Define this if this ever will work on Linux
|
||||
# PLATFORM_MAKE_CORLIB_CMP = yes
|
||||
|
||||
# This is for the security permission attribute problem
|
||||
# on windows
|
||||
PLATFORM_TWEAK_CORLIB_SOURCES = cat
|
||||
|
||||
# This is for changing / to \ on windows
|
||||
PLATFORM_CHANGE_SEPARATOR_CMD = cat
|
||||
# Don't define it so we don't needlessly copy the sources
|
||||
# file. This command is handy for testing:
|
||||
#
|
||||
# PLATFORM_CHANGE_SEPARATOR_CMD=sed -e 's,/,/./,g'
|
||||
|
||||
hidden_prefix = .
|
||||
hidden_suffix =
|
||||
|
||||
platform-check:
|
||||
@set fnord $(BOOTSTRAP_MCS) ; if type $$2 >/dev/null 2>&1 ; then :; else \
|
||||
@if ! type $(BOOTSTRAP_MCS) >/dev/null 2>&1 ; then \
|
||||
echo "*** You need a C# compiler installed to build MCS. (make sure mcs works from the command line)" ; \
|
||||
echo "*** Read INSTALL.txt for information on how to bootstrap" ; \
|
||||
echo "*** a Mono installation." ; \
|
||||
exit 1 ; \
|
||||
fi
|
||||
|
||||
|
||||
# I tried this but apparently Make's version strings aren't that
|
||||
# ... consistent between releases. Whatever.
|
||||
#
|
||||
|
||||
@@ -13,11 +13,10 @@ MCS = $(BOOTSTRAP_MCS)
|
||||
RESGEN = resgen.exe
|
||||
|
||||
PLATFORM_MAKE_CORLIB_CMP = yes
|
||||
PLATFORM_TWEAK_CORLIB_SOURCES=cat - corlib.dll.win32-excludes |sort |uniq -u
|
||||
PLATFORM_CHANGE_SEPARATOR_CMD=tr '/' '\\\\'
|
||||
PLATFORM_PATH_SEPARATOR = ;
|
||||
|
||||
TEST_RUNTIME = mono
|
||||
|
||||
hidden_prefix =
|
||||
hidden_suffix = .tmp
|
||||
|
||||
|
||||
@@ -16,11 +16,9 @@
|
||||
|
||||
ifdef PLATFORM_MONO_NATIVE
|
||||
MCS = MONO_PATH="$(topdir)/class/lib/$(PROFILE):$$MONO_PATH" $(INTERNAL_MCS)
|
||||
MBAS = MONO_PATH="$(topdir)/class/lib/$(PROFILE):$$MONO_PATH" $(INTERNAL_MBAS)
|
||||
TEST_RUNTIME = MONO_PATH="$(topdir)/class/lib/$(PROFILE):$$MONO_PATH" $(RUNTIME) --debug
|
||||
else
|
||||
MCS = $(PLATFORM_RUNTIME) $(BOOTSTRAP_MCS) /lib:$(topdir)/class/lib/$(PROFILE)
|
||||
MBAS = $(PLATFORM_RUNTIME) $(BOOTSTRAP_MBAS) /lib:$(topdir)/class/lib/$(PROFILE)
|
||||
endif
|
||||
|
||||
# nuttzing!
|
||||
@@ -28,4 +26,3 @@ endif
|
||||
profile-check:
|
||||
|
||||
PROFILE_MCS_FLAGS = -d:NET_1_1 -d:ONLY_1_1
|
||||
PROFILE_MBAS_FLAGS = -d:NET_1_1 -d:ONLY_1_1
|
||||
@@ -16,10 +16,8 @@ topdir := $(dots)
|
||||
VERSION = 0.93
|
||||
|
||||
USE_MCS_FLAGS = $(LOCAL_MCS_FLAGS) $(PLATFORM_MCS_FLAGS) $(PROFILE_MCS_FLAGS) $(MCS_FLAGS)
|
||||
USE_MBAS_FLAGS = $(LOCAL_MBAS_FLAGS) $(PLATFORM_MBAS_FLAGS) $(PROFILE_MBAS_FLAGS) $(MBAS_FLAGS)
|
||||
USE_CFLAGS = $(LOCAL_CFLAGS) $(CFLAGS)
|
||||
CSCOMPILE = $(MCS) $(USE_MCS_FLAGS)
|
||||
BASCOMPILE = $(MBAS) $(USE_MBAS_FLAGS)
|
||||
CCOMPILE = $(CC) $(USE_CFLAGS)
|
||||
BOOT_COMPILE = $(BOOTSTRAP_MCS) $(USE_MCS_FLAGS)
|
||||
INSTALL_DATA = $(INSTALL) -m 644
|
||||
@@ -27,7 +25,6 @@ INSTALL_BIN = $(INSTALL) -m 755
|
||||
INSTALL_LIB = $(INSTALL_BIN)
|
||||
MKINSTALLDIRS = $(SHELL) $(topdir)/mkinstalldirs
|
||||
INTERNAL_MCS = $(RUNTIME) $(topdir)/mcs/mcs.exe
|
||||
INTERNAL_MBAS = $(RUNTIME) $(topdir)/mbas/mbas.exe
|
||||
INTERNAL_GMCS = $(RUNTIME) $(topdir)/gmcs/gmcs.exe
|
||||
INTERNAL_ILASM = $(RUNTIME) $(topdir)/ilasm/ilasm.exe
|
||||
INTERNAL_RESGEN = $(RUNTIME) $(topdir)/monoresgen/monoresgen.exe
|
||||
@@ -127,8 +124,6 @@ test: test-recursive test-local
|
||||
|
||||
run-test: run-test-recursive test-local run-test-local
|
||||
|
||||
run-test-ondotnet: run-test-ondotnet-recursive test-local run-test-ondotnet-local
|
||||
|
||||
clean: clean-recursive clean-local
|
||||
|
||||
uninstall: uninstall-recursive uninstall-local
|
||||
|
||||
@@ -4,27 +4,6 @@
|
||||
// What a horrible interface.
|
||||
//
|
||||
|
||||
//
|
||||
// Permission is hereby granted, free of charge, to any person obtaining
|
||||
// a copy of this software and associated documentation files (the
|
||||
// "Software"), to deal in the Software without restriction, including
|
||||
// without limitation the rights to use, copy, modify, merge, publish,
|
||||
// distribute, sublicense, and/or sell copies of the Software, and to
|
||||
// permit persons to whom the Software is furnished to do so, subject to
|
||||
// the following conditions:
|
||||
//
|
||||
// The above copyright notice and this permission notice shall be
|
||||
// included in all copies or substantial portions of the Software.
|
||||
//
|
||||
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
||||
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
|
||||
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
|
||||
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
||||
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
//
|
||||
|
||||
namespace Accessibility {
|
||||
|
||||
public interface IAccessible {
|
||||
|
||||
@@ -1,24 +1,3 @@
|
||||
|
||||
//
|
||||
// Permission is hereby granted, free of charge, to any person obtaining
|
||||
// a copy of this software and associated documentation files (the
|
||||
// "Software"), to deal in the Software without restriction, including
|
||||
// without limitation the rights to use, copy, modify, merge, publish,
|
||||
// distribute, sublicense, and/or sell copies of the Software, and to
|
||||
// permit persons to whom the Software is furnished to do so, subject to
|
||||
// the following conditions:
|
||||
//
|
||||
// The above copyright notice and this permission notice shall be
|
||||
// included in all copies or substantial portions of the Software.
|
||||
//
|
||||
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
||||
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
|
||||
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
|
||||
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
||||
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
//
|
||||
interface IAccessibleHandler {
|
||||
// Opaque for now.
|
||||
}
|
||||
@@ -7,27 +7,6 @@
|
||||
// (C) 2003 Ximian, Inc. http://www.ximian.com
|
||||
//
|
||||
|
||||
//
|
||||
// Permission is hereby granted, free of charge, to any person obtaining
|
||||
// a copy of this software and associated documentation files (the
|
||||
// "Software"), to deal in the Software without restriction, including
|
||||
// without limitation the rights to use, copy, modify, merge, publish,
|
||||
// distribute, sublicense, and/or sell copies of the Software, and to
|
||||
// permit persons to whom the Software is furnished to do so, subject to
|
||||
// the following conditions:
|
||||
//
|
||||
// The above copyright notice and this permission notice shall be
|
||||
// included in all copies or substantial portions of the Software.
|
||||
//
|
||||
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
||||
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
|
||||
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
|
||||
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
||||
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
//
|
||||
|
||||
using System;
|
||||
using System.Reflection;
|
||||
using System.Resources;
|
||||
|
||||
@@ -1,16 +1,3 @@
|
||||
2004-06-24 Raja R Harinath <[email protected]>
|
||||
|
||||
* IBM.Data.DB2/Makefile: Disable for 'net_2_0'.
|
||||
|
||||
2004-06-23 Gonzalo Paniagua Javier <[email protected]>
|
||||
|
||||
* Makefile: enabled Mono.CSharp.Debugger on windows.
|
||||
|
||||
2004-06-11 Duncan Mak <[email protected]>
|
||||
|
||||
* IBM.Data.DB2/IBM.Data.DB2.dll.sources:
|
||||
* Makefile: Add IBM.Data.DB2.
|
||||
|
||||
2004-05-07 Raja R Harinath <[email protected]>
|
||||
|
||||
* Makefile (SUBDIRS): Build 'corlib' and first pass of 'System'
|
||||
|
||||
@@ -8,27 +8,6 @@
|
||||
// (C) 2004 Novell (http://www.novell.com)
|
||||
//
|
||||
|
||||
//
|
||||
// Permission is hereby granted, free of charge, to any person obtaining
|
||||
// a copy of this software and associated documentation files (the
|
||||
// "Software"), to deal in the Software without restriction, including
|
||||
// without limitation the rights to use, copy, modify, merge, publish,
|
||||
// distribute, sublicense, and/or sell copies of the Software, and to
|
||||
// permit persons to whom the Software is furnished to do so, subject to
|
||||
// the following conditions:
|
||||
//
|
||||
// The above copyright notice and this permission notice shall be
|
||||
// included in all copies or substantial portions of the Software.
|
||||
//
|
||||
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
||||
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
|
||||
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
|
||||
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
||||
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
//
|
||||
|
||||
using System;
|
||||
using System.Reflection;
|
||||
using System.Runtime.InteropServices;
|
||||
|
||||
@@ -8,27 +8,6 @@
|
||||
// (C) 2001 - 2003 Ximian, Inc (http://www.ximian.com)
|
||||
//
|
||||
|
||||
//
|
||||
// Permission is hereby granted, free of charge, to any person obtaining
|
||||
// a copy of this software and associated documentation files (the
|
||||
// "Software"), to deal in the Software without restriction, including
|
||||
// without limitation the rights to use, copy, modify, merge, publish,
|
||||
// distribute, sublicense, and/or sell copies of the Software, and to
|
||||
// permit persons to whom the Software is furnished to do so, subject to
|
||||
// the following conditions:
|
||||
//
|
||||
// The above copyright notice and this permission notice shall be
|
||||
// included in all copies or substantial portions of the Software.
|
||||
//
|
||||
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
||||
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
|
||||
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
|
||||
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
||||
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
//
|
||||
|
||||
internal sealed class Locale {
|
||||
|
||||
private Locale ()
|
||||
|
||||
@@ -1,12 +1,3 @@
|
||||
2004-06-21 Atsushi Enomoto <[email protected]>
|
||||
|
||||
* RdpPatterns.cs : Fixed ExpandRef() that caused incorrect nest error.
|
||||
|
||||
2004-06-17 Atsushi Enomoto <[email protected]>
|
||||
|
||||
* RdpPatterns.cs : Quick workaround for infinite loop happening in
|
||||
some kind of recursive expansion.
|
||||
|
||||
2004-03-12 Atsushi Enomoto <[email protected]>
|
||||
|
||||
* RdpPatterns.cs : Fixed TextDeriv() to allow whitespace text nodes
|
||||
|
||||
@@ -8,27 +8,6 @@
|
||||
//
|
||||
// See RELAX NG spec 7.2
|
||||
//
|
||||
|
||||
//
|
||||
// Permission is hereby granted, free of charge, to any person obtaining
|
||||
// a copy of this software and associated documentation files (the
|
||||
// "Software"), to deal in the Software without restriction, including
|
||||
// without limitation the rights to use, copy, modify, merge, publish,
|
||||
// distribute, sublicense, and/or sell copies of the Software, and to
|
||||
// permit persons to whom the Software is furnished to do so, subject to
|
||||
// the following conditions:
|
||||
//
|
||||
// The above copyright notice and this permission notice shall be
|
||||
// included in all copies or substantial portions of the Software.
|
||||
//
|
||||
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
||||
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
|
||||
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
|
||||
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
||||
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
//
|
||||
|
||||
namespace Commons.Xml.Relaxng.Derivative
|
||||
{
|
||||
|
||||
@@ -6,27 +6,6 @@
|
||||
//
|
||||
// 2003 Atsushi Enomoto "No rights reserved."
|
||||
//
|
||||
|
||||
//
|
||||
// Permission is hereby granted, free of charge, to any person obtaining
|
||||
// a copy of this software and associated documentation files (the
|
||||
// "Software"), to deal in the Software without restriction, including
|
||||
// without limitation the rights to use, copy, modify, merge, publish,
|
||||
// distribute, sublicense, and/or sell copies of the Software, and to
|
||||
// permit persons to whom the Software is furnished to do so, subject to
|
||||
// the following conditions:
|
||||
//
|
||||
// The above copyright notice and this permission notice shall be
|
||||
// included in all copies or substantial portions of the Software.
|
||||
//
|
||||
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
||||
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
|
||||
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
|
||||
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
||||
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
//
|
||||
|
||||
using System;
|
||||
using System.Xml;
|
||||
|
||||
@@ -6,27 +6,6 @@
|
||||
//
|
||||
// 2003 Atsushi Enomoto "No rights reserved."
|
||||
//
|
||||
|
||||
//
|
||||
// Permission is hereby granted, free of charge, to any person obtaining
|
||||
// a copy of this software and associated documentation files (the
|
||||
// "Software"), to deal in the Software without restriction, including
|
||||
// without limitation the rights to use, copy, modify, merge, publish,
|
||||
// distribute, sublicense, and/or sell copies of the Software, and to
|
||||
// permit persons to whom the Software is furnished to do so, subject to
|
||||
// the following conditions:
|
||||
//
|
||||
// The above copyright notice and this permission notice shall be
|
||||
// included in all copies or substantial portions of the Software.
|
||||
//
|
||||
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
||||
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
|
||||
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
|
||||
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
||||
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
//
|
||||
|
||||
using System;
|
||||
using System.Collections;
|
||||
|
||||
@@ -6,27 +6,6 @@
|
||||
//
|
||||
// 2003 Atsushi Enomoto "No rights reserved."
|
||||
//
|
||||
|
||||
//
|
||||
// Permission is hereby granted, free of charge, to any person obtaining
|
||||
// a copy of this software and associated documentation files (the
|
||||
// "Software"), to deal in the Software without restriction, including
|
||||
// without limitation the rights to use, copy, modify, merge, publish,
|
||||
// distribute, sublicense, and/or sell copies of the Software, and to
|
||||
// permit persons to whom the Software is furnished to do so, subject to
|
||||
// the following conditions:
|
||||
//
|
||||
// The above copyright notice and this permission notice shall be
|
||||
// included in all copies or substantial portions of the Software.
|
||||
//
|
||||
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
||||
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
|
||||
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
|
||||
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
||||
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
//
|
||||
|
||||
using System;
|
||||
using System.Collections;
|
||||
@@ -1404,17 +1383,11 @@ namespace Commons.Xml.Relaxng.Derivative
|
||||
|
||||
|
||||
bool isExpanded;
|
||||
short expanding; // FIXME: It is totally not required, but there is
|
||||
// some bugs in simplification and without it it causes infinite loop.
|
||||
internal override RdpPattern ExpandRef (Hashtable defs)
|
||||
{
|
||||
if (!isExpanded) {
|
||||
isExpanded = true;
|
||||
if (expanding == 100)
|
||||
throw new RelaxngException (String.Format ("Invalid recursion was found. Name is {0}", nameClass));
|
||||
expanding++;
|
||||
children = children.ExpandRef (defs);
|
||||
expanding--;
|
||||
}
|
||||
return this;
|
||||
}
|
||||
|
||||
@@ -6,27 +6,6 @@
|
||||
//
|
||||
// 2003 Atsushi Enomoto "No rights reserved."
|
||||
//
|
||||
|
||||
//
|
||||
// Permission is hereby granted, free of charge, to any person obtaining
|
||||
// a copy of this software and associated documentation files (the
|
||||
// "Software"), to deal in the Software without restriction, including
|
||||
// without limitation the rights to use, copy, modify, merge, publish,
|
||||
// distribute, sublicense, and/or sell copies of the Software, and to
|
||||
// permit persons to whom the Software is furnished to do so, subject to
|
||||
// the following conditions:
|
||||
//
|
||||
// The above copyright notice and this permission notice shall be
|
||||
// included in all copies or substantial portions of the Software.
|
||||
//
|
||||
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
||||
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
|
||||
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
|
||||
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
||||
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
//
|
||||
|
||||
using System;
|
||||
using System.Collections;
|
||||
|
||||
@@ -1,8 +1,3 @@
|
||||
2004-06-07 Atsushi Enomoto <[email protected]>
|
||||
|
||||
* RncParser.jay : removed unused code. Fixed LookupNamespace() to
|
||||
pass atomized name always.
|
||||
|
||||
2004-05-31 Atsushi Enomoto <[email protected]>
|
||||
|
||||
* RncParser.jay : now error output is disabled.
|
||||
|
||||
@@ -85,6 +85,30 @@ namespace Commons.Xml.Relaxng.Rnc
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
private RelaxngElementBase ApplyAnnotations (string annotation, RelaxngElementBase element)
|
||||
{
|
||||
// Do nothing as yet for annotation.
|
||||
return element;
|
||||
}
|
||||
*/
|
||||
|
||||
/*
|
||||
private RelaxngPatternList ApplyAnnotationsGroup (string annotation, RelaxngPatternList elements)
|
||||
{
|
||||
// Do nothing as yet for annotation.
|
||||
return elements;
|
||||
}
|
||||
*/
|
||||
|
||||
/*
|
||||
private RelaxngNameClassList ApplyAnnotationsChoice (string annotation, RelaxngNameClassList elements)
|
||||
{
|
||||
// Do nothing as yet for annotation.
|
||||
return elements;
|
||||
}
|
||||
*/
|
||||
|
||||
private XmlQualifiedName SplitQName (XmlNamespaceManager nsmgr, string name)
|
||||
{
|
||||
int colon = name.IndexOf (':');
|
||||
@@ -92,8 +116,25 @@ namespace Commons.Xml.Relaxng.Rnc
|
||||
return new XmlQualifiedName (name, String.Empty);
|
||||
string local = name.Substring (colon + 1);
|
||||
string prefix = name.Substring (0, colon);
|
||||
return new XmlQualifiedName (local, nsmgr.LookupNamespace (nsmgr.NameTable.Get (prefix)));
|
||||
return new XmlQualifiedName (local, nsmgr.LookupNamespace (prefix));
|
||||
}
|
||||
/*
|
||||
private RelaxngPatternList ConcatList (RelaxngPatternList listL, RelaxngPatternList listR)
|
||||
{
|
||||
RelaxngPatternList ret = listL;
|
||||
if (ret != null) {
|
||||
foreach (RelaxngPattern p in listR)
|
||||
ret.Add (p);
|
||||
} else {
|
||||
ret = new RelaxngPatternList ();
|
||||
foreach (RelaxngPattern p in listL)
|
||||
ret.Add (p);
|
||||
foreach (RelaxngPattern p in listR)
|
||||
ret.Add (p);
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
*/
|
||||
|
||||
private void FillElementDefaultNS (RelaxngNameClass nc)
|
||||
{
|
||||
|
||||
@@ -7,27 +7,6 @@
|
||||
// (C)2003 Atsushi Enomoto
|
||||
// (C)2004 Novell Inc.
|
||||
//
|
||||
|
||||
//
|
||||
// Permission is hereby granted, free of charge, to any person obtaining
|
||||
// a copy of this software and associated documentation files (the
|
||||
// "Software"), to deal in the Software without restriction, including
|
||||
// without limitation the rights to use, copy, modify, merge, publish,
|
||||
// distribute, sublicense, and/or sell copies of the Software, and to
|
||||
// permit persons to whom the Software is furnished to do so, subject to
|
||||
// the following conditions:
|
||||
//
|
||||
// The above copyright notice and this permission notice shall be
|
||||
// included in all copies or substantial portions of the Software.
|
||||
//
|
||||
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
||||
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
|
||||
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
|
||||
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
||||
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
//
|
||||
|
||||
using System;
|
||||
using System.Collections;
|
||||
|
||||
@@ -1,22 +1,3 @@
|
||||
2004-06-21 Atsushi Enomoto <[email protected]>
|
||||
|
||||
* Misc.cs,
|
||||
RelaxngPattern.cs,
|
||||
RelaxngReader.cs :
|
||||
Use XmlResolver (or XmlUrlResolver) directly. XmlResolver was
|
||||
incorrectly _used_ before null check. Don't create XmlResolver
|
||||
instance for _every_ pattern object.
|
||||
* RelaxngPattern.cs : UnresolvedRef.ExpandRef() should return not
|
||||
try to find target derivative pattern twice. It was the culprit of
|
||||
infinite loop. Removed dirty switches.
|
||||
* RelaxngGrammar.cs : code cleanup.
|
||||
|
||||
2004-06-17 Atsushi Enomoto <[email protected]>
|
||||
|
||||
* Misc.cs, RelaxngGrammar.cs, RelaxngPattern.cs, RelaxngReader.cs :
|
||||
Added XmlResolver property to fix bug #60334.
|
||||
Check incrrect recursion check that caused possible infinite loop.
|
||||
|
||||
2004-05-31 Atsushi Enomoto <[email protected]>
|
||||
|
||||
* Misc.cs : made Util class internal.
|
||||
|
||||
@@ -6,27 +6,6 @@
|
||||
//
|
||||
// 2003 Atsushi Enomoto "No rights reserved."
|
||||
//
|
||||
|
||||
//
|
||||
// Permission is hereby granted, free of charge, to any person obtaining
|
||||
// a copy of this software and associated documentation files (the
|
||||
// "Software"), to deal in the Software without restriction, including
|
||||
// without limitation the rights to use, copy, modify, merge, publish,
|
||||
// distribute, sublicense, and/or sell copies of the Software, and to
|
||||
// permit persons to whom the Software is furnished to do so, subject to
|
||||
// the following conditions:
|
||||
//
|
||||
// The above copyright notice and this permission notice shall be
|
||||
// included in all copies or substantial portions of the Software.
|
||||
//
|
||||
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
||||
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
|
||||
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
|
||||
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
||||
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
//
|
||||
using System;
|
||||
using System.Collections;
|
||||
using System.IO;
|
||||
@@ -37,18 +16,42 @@ namespace Commons.Xml.Relaxng
|
||||
{
|
||||
internal class Util
|
||||
{
|
||||
/*
|
||||
public static string ResolveUri (string baseUri, string href, XmlResolver resolver)
|
||||
public static string ResolveUri (string baseUri, string href)
|
||||
{
|
||||
#if true
|
||||
Uri uri = null;
|
||||
if (baseUri != null && baseUri.Length > 0)
|
||||
uri = new Uri (baseUri);
|
||||
Uri result = resolver.ResolveUri (uri, href);
|
||||
Uri result = new XmlUrlResolver ().ResolveUri (uri, href);
|
||||
if (result.Query.Length > 0 || result.Fragment.Length > 0)
|
||||
throw new RelaxngException ("Invalid URI format: " + href);
|
||||
return result.ToString ();
|
||||
#else
|
||||
// If baseUri does not exist, then it is only the way.
|
||||
if (baseUri == String.Empty)
|
||||
return href;
|
||||
|
||||
// If href itself is a uri, then return it directly.
|
||||
try {
|
||||
return new Uri (href).ToString ();
|
||||
} catch (UriFormatException) {
|
||||
}
|
||||
|
||||
// If baseUri is a valid uri, then make relative uri.
|
||||
try {
|
||||
return new Uri (
|
||||
new Uri (baseUri), href).ToString ();
|
||||
} catch (UriFormatException) {
|
||||
}
|
||||
|
||||
// Otherwise, they might be filesystem path.
|
||||
if (Path.IsPathRooted (href))
|
||||
return href;
|
||||
|
||||
return Path.Combine (
|
||||
Path.GetDirectoryName (baseUri), href);
|
||||
#endif
|
||||
}
|
||||
*/
|
||||
|
||||
public static string NormalizeWhitespace (string s)
|
||||
{
|
||||
|
||||
@@ -6,27 +6,6 @@
|
||||
//
|
||||
// (C)2004 Novell Inc.
|
||||
//
|
||||
|
||||
//
|
||||
// Permission is hereby granted, free of charge, to any person obtaining
|
||||
// a copy of this software and associated documentation files (the
|
||||
// "Software"), to deal in the Software without restriction, including
|
||||
// without limitation the rights to use, copy, modify, merge, publish,
|
||||
// distribute, sublicense, and/or sell copies of the Software, and to
|
||||
// permit persons to whom the Software is furnished to do so, subject to
|
||||
// the following conditions:
|
||||
//
|
||||
// The above copyright notice and this permission notice shall be
|
||||
// included in all copies or substantial portions of the Software.
|
||||
//
|
||||
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
||||
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
|
||||
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
|
||||
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
||||
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
//
|
||||
using System;
|
||||
using System.Xml;
|
||||
|
||||
|
||||
@@ -6,27 +6,6 @@
|
||||
//
|
||||
// (C)2004 Novell Inc.
|
||||
//
|
||||
|
||||
//
|
||||
// Permission is hereby granted, free of charge, to any person obtaining
|
||||
// a copy of this software and associated documentation files (the
|
||||
// "Software"), to deal in the Software without restriction, including
|
||||
// without limitation the rights to use, copy, modify, merge, publish,
|
||||
// distribute, sublicense, and/or sell copies of the Software, and to
|
||||
// permit persons to whom the Software is furnished to do so, subject to
|
||||
// the following conditions:
|
||||
//
|
||||
// The above copyright notice and this permission notice shall be
|
||||
// included in all copies or substantial portions of the Software.
|
||||
//
|
||||
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
||||
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
|
||||
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
|
||||
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
||||
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
//
|
||||
|
||||
using System;
|
||||
using System.Xml;
|
||||
|
||||
@@ -6,27 +6,6 @@
|
||||
//
|
||||
// (C)2004 Novell Inc.
|
||||
//
|
||||
|
||||
//
|
||||
// Permission is hereby granted, free of charge, to any person obtaining
|
||||
// a copy of this software and associated documentation files (the
|
||||
// "Software"), to deal in the Software without restriction, including
|
||||
// without limitation the rights to use, copy, modify, merge, publish,
|
||||
// distribute, sublicense, and/or sell copies of the Software, and to
|
||||
// permit persons to whom the Software is furnished to do so, subject to
|
||||
// the following conditions:
|
||||
//
|
||||
// The above copyright notice and this permission notice shall be
|
||||
// included in all copies or substantial portions of the Software.
|
||||
//
|
||||
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
||||
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
|
||||
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
|
||||
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
||||
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
//
|
||||
using System;
|
||||
using System.Xml;
|
||||
|
||||
|
||||
@@ -6,27 +6,6 @@
|
||||
//
|
||||
// 2003 Atsushi Enomoto "No rights reserved."
|
||||
//
|
||||
|
||||
//
|
||||
// Permission is hereby granted, free of charge, to any person obtaining
|
||||
// a copy of this software and associated documentation files (the
|
||||
// "Software"), to deal in the Software without restriction, including
|
||||
// without limitation the rights to use, copy, modify, merge, publish,
|
||||
// distribute, sublicense, and/or sell copies of the Software, and to
|
||||
// permit persons to whom the Software is furnished to do so, subject to
|
||||
// the following conditions:
|
||||
//
|
||||
// The above copyright notice and this permission notice shall be
|
||||
// included in all copies or substantial portions of the Software.
|
||||
//
|
||||
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
||||
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
|
||||
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
|
||||
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
||||
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
//
|
||||
using System;
|
||||
using System.Collections;
|
||||
using System.IO;
|
||||
|
||||
@@ -6,27 +6,7 @@
|
||||
//
|
||||
// 2003 Atsushi Enomoto "No rights reserved."
|
||||
//
|
||||
|
||||
//
|
||||
// Permission is hereby granted, free of charge, to any person obtaining
|
||||
// a copy of this software and associated documentation files (the
|
||||
// "Software"), to deal in the Software without restriction, including
|
||||
// without limitation the rights to use, copy, modify, merge, publish,
|
||||
// distribute, sublicense, and/or sell copies of the Software, and to
|
||||
// permit persons to whom the Software is furnished to do so, subject to
|
||||
// the following conditions:
|
||||
//
|
||||
// The above copyright notice and this permission notice shall be
|
||||
// included in all copies or substantial portions of the Software.
|
||||
//
|
||||
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
||||
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
|
||||
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
|
||||
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
||||
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
//
|
||||
|
||||
using System;
|
||||
using System.Collections;
|
||||
using System.IO;
|
||||
@@ -61,6 +41,7 @@ namespace Commons.Xml.Relaxng
|
||||
|
||||
Hashtable includedUris = new Hashtable ();
|
||||
RelaxngGrammar parentGrammar;
|
||||
ArrayList includedGrammars;
|
||||
Hashtable refPatterns = new Hashtable (); // key = RdpPattern of assembledDefs
|
||||
|
||||
// only for checkRecursion()
|
||||
@@ -195,7 +176,13 @@ namespace Commons.Xml.Relaxng
|
||||
// here we collected element-replaced definitions
|
||||
foreach (DictionaryEntry entry in elementReplacedDefs)
|
||||
assembledDefs.Add (entry.Key, entry.Value);
|
||||
#if REPLACE_IN_ADVANCE
|
||||
// Well, actual expandRef should be done after checking constraints
|
||||
// 4.19 (c) expandRef
|
||||
startPattern = compiledStart.ExpandRef (assembledDefs);
|
||||
#else
|
||||
startPattern = compiledStart;
|
||||
#endif
|
||||
// 4.20,21 reduce notAllowed and empty.
|
||||
bool b;
|
||||
do {
|
||||
@@ -220,8 +207,10 @@ namespace Commons.Xml.Relaxng
|
||||
|
||||
// TODO: 7.3
|
||||
|
||||
#if !REPLACE_IN_ADVANCE
|
||||
// 4.19 (c) expandRef - actual replacement
|
||||
startPattern = compiledStart.ExpandRef (assembledDefs);
|
||||
#endif
|
||||
|
||||
// return its start pattern.
|
||||
IsCompiled = true;
|
||||
@@ -231,8 +220,10 @@ namespace Commons.Xml.Relaxng
|
||||
private void CheckStartPatternContent (RdpPattern p)
|
||||
{
|
||||
switch (p.PatternType) {
|
||||
#if !REPLACE_IN_ADVANCE
|
||||
case RelaxngPatternType.Ref:
|
||||
CheckStartPatternContent (((RdpUnresolvedRef) p).RefPattern);
|
||||
#endif
|
||||
break;
|
||||
case RelaxngPatternType.Element:
|
||||
break;
|
||||
@@ -286,8 +277,8 @@ namespace Commons.Xml.Relaxng
|
||||
checkRecursionDepth = (int) checkedDepth;
|
||||
// get refPattern
|
||||
RdpUnresolvedRef pref = p as RdpUnresolvedRef;
|
||||
RelaxngGrammar target = pref.TargetGrammar;
|
||||
RdpPattern refPattern = pref.RefPattern;
|
||||
RelaxngGrammar target = pref.TargetGrammar;//pref.IsParentRef ? parentGrammar : this;
|
||||
RdpPattern refPattern = pref.RefPattern;//target.assembledDefs [pref.Name] as RdpPattern;
|
||||
if (refPattern == null)
|
||||
throw new RelaxngException ("No matching define found for " + pref.Name);
|
||||
|
||||
@@ -324,15 +315,21 @@ namespace Commons.Xml.Relaxng
|
||||
private void CollectGrammars ()
|
||||
{
|
||||
// collect ref and parentRef for each define.
|
||||
includedGrammars = (parentGrammar != null) ?
|
||||
parentGrammar.includedGrammars : new ArrayList ();
|
||||
|
||||
// FIXME: This should be assembledStart.
|
||||
CheckReferences (compiledStart);
|
||||
FixupReference ();
|
||||
this.unresolvedPatterns.Clear ();
|
||||
|
||||
// Hashtable ht = assembledDefs.Clone () as Hashtable;
|
||||
// foreach (string name in ht.Keys) {
|
||||
foreach (string name in assembledDefs.Keys) {
|
||||
RdpPattern p = (RdpPattern) assembledDefs [name];
|
||||
CheckReferences (p);
|
||||
FixupReference ();
|
||||
this.unresolvedPatterns.Clear ();
|
||||
}
|
||||
|
||||
// If it is child of any other pattern:
|
||||
@@ -347,22 +344,15 @@ namespace Commons.Xml.Relaxng
|
||||
if (al == null)
|
||||
continue; // Not referenced.
|
||||
|
||||
// At this point, parent grammar doesn't
|
||||
// collect assembledDefs as yet
|
||||
string uname = GetUniqueName (name, parentGrammar);
|
||||
parentGrammar.assembledDefs [uname] = assembledDefs [name];
|
||||
if (parentGrammar.assembledDefs [name] == null)
|
||||
parentGrammar.assembledDefs [name] =
|
||||
this.assembledDefs [name];
|
||||
else
|
||||
replaceDefines (name, al);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private static string GetUniqueName (string name, RelaxngGrammar grammar)
|
||||
{
|
||||
foreach (RelaxngDefine def in grammar.Defines)
|
||||
if (def.Name == name)
|
||||
return GetUniqueName (name + '_', grammar);
|
||||
return name;
|
||||
}
|
||||
|
||||
private void FixupReference ()
|
||||
{
|
||||
foreach (RdpUnresolvedRef pref in this.unresolvedPatterns) {
|
||||
@@ -376,7 +366,6 @@ namespace Commons.Xml.Relaxng
|
||||
}
|
||||
al.Add (pref);
|
||||
}
|
||||
this.unresolvedPatterns.Clear ();
|
||||
}
|
||||
|
||||
private void replaceDefines (string name, ArrayList al)
|
||||
|
||||
@@ -6,27 +6,6 @@
|
||||
//
|
||||
// (C)2004 Novell Inc.
|
||||
//
|
||||
|
||||
//
|
||||
// Permission is hereby granted, free of charge, to any person obtaining
|
||||
// a copy of this software and associated documentation files (the
|
||||
// "Software"), to deal in the Software without restriction, including
|
||||
// without limitation the rights to use, copy, modify, merge, publish,
|
||||
// distribute, sublicense, and/or sell copies of the Software, and to
|
||||
// permit persons to whom the Software is furnished to do so, subject to
|
||||
// the following conditions:
|
||||
//
|
||||
// The above copyright notice and this permission notice shall be
|
||||
// included in all copies or substantial portions of the Software.
|
||||
//
|
||||
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
||||
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
|
||||
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
|
||||
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
||||
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
//
|
||||
using System;
|
||||
using System.Collections;
|
||||
using Commons.Xml.Relaxng.XmlSchema;
|
||||
|
||||
@@ -6,27 +6,6 @@
|
||||
//
|
||||
// 2003 Atsushi Enomoto "No rights reserved."
|
||||
//
|
||||
|
||||
//
|
||||
// Permission is hereby granted, free of charge, to any person obtaining
|
||||
// a copy of this software and associated documentation files (the
|
||||
// "Software"), to deal in the Software without restriction, including
|
||||
// without limitation the rights to use, copy, modify, merge, publish,
|
||||
// distribute, sublicense, and/or sell copies of the Software, and to
|
||||
// permit persons to whom the Software is furnished to do so, subject to
|
||||
// the following conditions:
|
||||
//
|
||||
// The above copyright notice and this permission notice shall be
|
||||
// included in all copies or substantial portions of the Software.
|
||||
//
|
||||
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
||||
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
|
||||
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
|
||||
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
||||
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
//
|
||||
|
||||
using System;
|
||||
using System.Collections;
|
||||
|
||||
@@ -6,27 +6,6 @@
|
||||
//
|
||||
// 2003 Atsushi Enomoto "No rights reserved."
|
||||
//
|
||||
|
||||
//
|
||||
// Permission is hereby granted, free of charge, to any person obtaining
|
||||
// a copy of this software and associated documentation files (the
|
||||
// "Software"), to deal in the Software without restriction, including
|
||||
// without limitation the rights to use, copy, modify, merge, publish,
|
||||
// distribute, sublicense, and/or sell copies of the Software, and to
|
||||
// permit persons to whom the Software is furnished to do so, subject to
|
||||
// the following conditions:
|
||||
//
|
||||
// The above copyright notice and this permission notice shall be
|
||||
// included in all copies or substantial portions of the Software.
|
||||
//
|
||||
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
||||
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
|
||||
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
|
||||
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
||||
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
//
|
||||
|
||||
using System;
|
||||
using System.Collections;
|
||||
@@ -288,13 +267,10 @@ namespace Commons.Xml.Relaxng
|
||||
{
|
||||
grammar.CheckIncludeRecursion (Href);
|
||||
grammar.IncludedUris.Add (Href, Href);
|
||||
if (grammar.Resolver == null)
|
||||
throw new RelaxngException ("To compile 'include' element, XmlResolver is required.");
|
||||
Uri uri = grammar.Resolver.ResolveUri (BaseUri != String.Empty ? new Uri (BaseUri) : null, Href);
|
||||
XmlTextReader xtr = null;
|
||||
string url = Util.ResolveUri (BaseUri, href);
|
||||
XmlTextReader xtr = new XmlTextReader (url);
|
||||
RelaxngGrammar g = null;
|
||||
try {
|
||||
xtr = new XmlTextReader (uri.AbsoluteUri, (Stream) grammar.Resolver.GetEntity (uri, null, typeof (Stream)));
|
||||
RelaxngReader r = new RelaxngReader (xtr, ns);
|
||||
r.MoveToContent ();
|
||||
g = r.ReadPattern () as RelaxngGrammar;
|
||||
@@ -432,17 +408,8 @@ namespace Commons.Xml.Relaxng
|
||||
// Private Fields
|
||||
RdpPattern startRelaxngPattern;
|
||||
RelaxngDatatypeProvider provider;
|
||||
XmlResolver resolver;
|
||||
bool nullResolver;
|
||||
|
||||
// Public
|
||||
public XmlResolver XmlResolver {
|
||||
set {
|
||||
nullResolver = value == null;
|
||||
resolver = value;
|
||||
}
|
||||
}
|
||||
|
||||
public abstract RelaxngPatternType PatternType { get; }
|
||||
public RelaxngDatatypeProvider DataProvider {
|
||||
get {
|
||||
@@ -460,7 +427,6 @@ namespace Commons.Xml.Relaxng
|
||||
g = (RelaxngGrammar) this;
|
||||
else {
|
||||
g = new RelaxngGrammar ();
|
||||
g.XmlResolver = this.Resolver;
|
||||
g.BaseUri = this.BaseUri;
|
||||
g.LineNumber = this.LineNumber;
|
||||
g.LinePosition = this.LinePosition;
|
||||
@@ -478,16 +444,6 @@ namespace Commons.Xml.Relaxng
|
||||
|
||||
|
||||
// Internal
|
||||
internal XmlResolver Resolver {
|
||||
get {
|
||||
if (nullResolver)
|
||||
return null;
|
||||
if (resolver == null)
|
||||
resolver = new XmlUrlResolver ();
|
||||
return resolver;
|
||||
}
|
||||
}
|
||||
|
||||
internal abstract void CheckConstraints ();
|
||||
|
||||
protected RelaxngPattern ()
|
||||
@@ -961,7 +917,11 @@ namespace Commons.Xml.Relaxng
|
||||
}
|
||||
|
||||
public override RdpContentType ContentType {
|
||||
#if REPLACE_IN_ADVANCE
|
||||
get { throw new InvalidOperationException (); }
|
||||
#else
|
||||
get { return RdpContentType.Empty; }
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
@@ -973,7 +933,10 @@ namespace Commons.Xml.Relaxng
|
||||
|
||||
internal override RdpPattern ExpandRef (Hashtable defs)
|
||||
{
|
||||
return referencedPattern.ExpandRef (defs);
|
||||
RdpPattern target = (RdpPattern) defs [this.name];
|
||||
if (target == null)
|
||||
throw new RelaxngException ("Target definition " + name + " not found.");
|
||||
return target.ExpandRef (defs);
|
||||
}
|
||||
|
||||
internal override void MarkReachableDefs ()
|
||||
@@ -1100,27 +1063,17 @@ namespace Commons.Xml.Relaxng
|
||||
{
|
||||
grammar.CheckIncludeRecursion (Href);
|
||||
grammar.IncludedUris.Add (Href, Href);
|
||||
if (grammar.Resolver == null)
|
||||
throw new RelaxngException ("To compile 'include' element, XmlResolver is required.");
|
||||
Uri uri = grammar.Resolver.ResolveUri (BaseUri != String.Empty ? new Uri (BaseUri) : null, Href);
|
||||
XmlTextReader xtr = null;
|
||||
try {
|
||||
xtr = new XmlTextReader (uri.AbsoluteUri, (Stream) grammar.Resolver.GetEntity (uri, null, typeof (Stream)));
|
||||
RelaxngReader r = new RelaxngReader (xtr, ns);
|
||||
r.MoveToContent ();
|
||||
RelaxngPattern p = r.ReadPattern ();
|
||||
p.DataProvider = grammar.Provider;
|
||||
string uri = Util.ResolveUri (this.BaseUri, href);
|
||||
RelaxngReader r = new RelaxngReader (new XmlTextReader (uri), ns);
|
||||
r.MoveToContent ();
|
||||
RelaxngPattern p = r.ReadPattern ();
|
||||
p.DataProvider = grammar.Provider;
|
||||
|
||||
RdpPattern ret = p.Compile (grammar);
|
||||
RdpPattern ret = p.Compile (grammar);
|
||||
|
||||
grammar.IncludedUris.Remove (Href);
|
||||
|
||||
return ret;
|
||||
} finally {
|
||||
if (xtr != null)
|
||||
xtr.Close ();
|
||||
}
|
||||
grammar.IncludedUris.Remove (Href);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
internal override void CheckConstraints ()
|
||||
|
||||
@@ -6,27 +6,6 @@
|
||||
//
|
||||
// 2003 Atsushi Enomoto "No rights reserved."
|
||||
//
|
||||
|
||||
//
|
||||
// Permission is hereby granted, free of charge, to any person obtaining
|
||||
// a copy of this software and associated documentation files (the
|
||||
// "Software"), to deal in the Software without restriction, including
|
||||
// without limitation the rights to use, copy, modify, merge, publish,
|
||||
// distribute, sublicense, and/or sell copies of the Software, and to
|
||||
// permit persons to whom the Software is furnished to do so, subject to
|
||||
// the following conditions:
|
||||
//
|
||||
// The above copyright notice and this permission notice shall be
|
||||
// included in all copies or substantial portions of the Software.
|
||||
//
|
||||
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
||||
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
|
||||
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
|
||||
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
||||
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
//
|
||||
using System;
|
||||
using System.Collections;
|
||||
using System.Collections.Specialized;
|
||||
|
||||
@@ -6,27 +6,6 @@
|
||||
//
|
||||
// 2003 Atsushi Enomoto "No rights reserved."
|
||||
//
|
||||
|
||||
//
|
||||
// Permission is hereby granted, free of charge, to any person obtaining
|
||||
// a copy of this software and associated documentation files (the
|
||||
// "Software"), to deal in the Software without restriction, including
|
||||
// without limitation the rights to use, copy, modify, merge, publish,
|
||||
// distribute, sublicense, and/or sell copies of the Software, and to
|
||||
// permit persons to whom the Software is furnished to do so, subject to
|
||||
// the following conditions:
|
||||
//
|
||||
// The above copyright notice and this permission notice shall be
|
||||
// included in all copies or substantial portions of the Software.
|
||||
//
|
||||
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
||||
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
|
||||
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
|
||||
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
||||
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
//
|
||||
|
||||
using System;
|
||||
using System.Collections;
|
||||
@@ -54,7 +33,6 @@ namespace Commons.Xml.Relaxng
|
||||
// fields
|
||||
Stack nsStack = new Stack ();
|
||||
Stack datatypeLibraryStack = new Stack ();
|
||||
XmlResolver resolver = new XmlUrlResolver ();
|
||||
|
||||
// ctor
|
||||
public RelaxngReader (XmlReader reader)
|
||||
@@ -74,14 +52,6 @@ namespace Commons.Xml.Relaxng
|
||||
MoveToContent ();
|
||||
}
|
||||
|
||||
public XmlResolver XmlResolver {
|
||||
set { resolver = value; }
|
||||
}
|
||||
|
||||
internal XmlResolver Resolver {
|
||||
get { return resolver; }
|
||||
}
|
||||
|
||||
private void FillLocation (RelaxngElementBase el)
|
||||
{
|
||||
el.BaseUri = BaseURI;
|
||||
@@ -462,8 +432,7 @@ namespace Commons.Xml.Relaxng
|
||||
string href = GetSpaceStrippedAttribute ("href");
|
||||
if (href == null)
|
||||
throw new RelaxngException ("Required attribute href was not found.");
|
||||
XmlResolver res = resolver != null ? resolver : new XmlUrlResolver ();
|
||||
i.Href = res.ResolveUri (BaseURI != null ? new Uri (BaseURI) : null, href).AbsoluteUri;
|
||||
i.Href = Util.ResolveUri (BaseURI, href);
|
||||
if (!IsEmptyElement) {
|
||||
Read ();
|
||||
this.readGrammarIncludeContent (i.Starts, i.Defines, i.Divs, null);
|
||||
@@ -662,8 +631,7 @@ namespace Commons.Xml.Relaxng
|
||||
string href = GetSpaceStrippedAttribute ("href");
|
||||
if (href == null)
|
||||
throw new RelaxngException ("Required attribute href was not found.");
|
||||
XmlResolver res = resolver != null ? resolver : new XmlUrlResolver ();
|
||||
r.Href = res.ResolveUri (BaseURI != null ? new Uri (BaseURI) : null, href).AbsoluteUri;
|
||||
r.Href = Util.ResolveUri (BaseURI, href);
|
||||
r.NSContext = ContextNamespace;
|
||||
if (!IsEmptyElement) {
|
||||
Read ();
|
||||
|
||||
@@ -6,27 +6,6 @@
|
||||
//
|
||||
// (C)2003 Atsushi Enomoto. "Some rights reserved."
|
||||
//
|
||||
|
||||
//
|
||||
// Permission is hereby granted, free of charge, to any person obtaining
|
||||
// a copy of this software and associated documentation files (the
|
||||
// "Software"), to deal in the Software without restriction, including
|
||||
// without limitation the rights to use, copy, modify, merge, publish,
|
||||
// distribute, sublicense, and/or sell copies of the Software, and to
|
||||
// permit persons to whom the Software is furnished to do so, subject to
|
||||
// the following conditions:
|
||||
//
|
||||
// The above copyright notice and this permission notice shall be
|
||||
// included in all copies or substantial portions of the Software.
|
||||
//
|
||||
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
||||
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
|
||||
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
|
||||
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
||||
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
//
|
||||
using System;
|
||||
using System.Collections;
|
||||
using System.Xml;
|
||||
|
||||
@@ -6,27 +6,6 @@
|
||||
//
|
||||
// (C)2004 Novell Inc.
|
||||
//
|
||||
|
||||
//
|
||||
// Permission is hereby granted, free of charge, to any person obtaining
|
||||
// a copy of this software and associated documentation files (the
|
||||
// "Software"), to deal in the Software without restriction, including
|
||||
// without limitation the rights to use, copy, modify, merge, publish,
|
||||
// distribute, sublicense, and/or sell copies of the Software, and to
|
||||
// permit persons to whom the Software is furnished to do so, subject to
|
||||
// the following conditions:
|
||||
//
|
||||
// The above copyright notice and this permission notice shall be
|
||||
// included in all copies or substantial portions of the Software.
|
||||
//
|
||||
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
||||
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
|
||||
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
|
||||
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
||||
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
//
|
||||
using System;
|
||||
using System.Collections;
|
||||
using System.Text;
|
||||
|
||||
@@ -1,7 +1,3 @@
|
||||
2004-06-17 Atsushi Enomoto <[email protected]>
|
||||
|
||||
* XmlDefaultReader.cs : don't catch the exception.
|
||||
|
||||
2004-02-25 Atsushi Enomoto <[email protected]>
|
||||
|
||||
* XmlDefaultReader.cs : Added support for IXmlLineInfo.
|
||||
|
||||
@@ -6,27 +6,6 @@
|
||||
//
|
||||
// 2003 Atsushi Enomoto "No rights reserved."
|
||||
//
|
||||
|
||||
//
|
||||
// Permission is hereby granted, free of charge, to any person obtaining
|
||||
// a copy of this software and associated documentation files (the
|
||||
// "Software"), to deal in the Software without restriction, including
|
||||
// without limitation the rights to use, copy, modify, merge, publish,
|
||||
// distribute, sublicense, and/or sell copies of the Software, and to
|
||||
// permit persons to whom the Software is furnished to do so, subject to
|
||||
// the following conditions:
|
||||
//
|
||||
// The above copyright notice and this permission notice shall be
|
||||
// included in all copies or substantial portions of the Software.
|
||||
//
|
||||
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
||||
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
|
||||
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
|
||||
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
||||
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
//
|
||||
|
||||
//
|
||||
// Similar to SAX DefaultHandler
|
||||
@@ -207,7 +186,11 @@ namespace Commons.Xml
|
||||
|
||||
public override bool Read ()
|
||||
{
|
||||
return Reader.Read ();
|
||||
try {
|
||||
return Reader.Read ();
|
||||
} catch (Exception ex) {
|
||||
throw ex;
|
||||
}
|
||||
}
|
||||
|
||||
public override string ReadString ()
|
||||
|
||||
@@ -1,8 +1,3 @@
|
||||
2004-06-17 Atsushi Enomoto <[email protected]>
|
||||
|
||||
* relaxngtest.cs : Now we can test all cases (though resulting in
|
||||
failure). Catch unexpected exception and report them as such.
|
||||
|
||||
2004-05-31 Atsushi Enomoto <[email protected]>
|
||||
|
||||
* anglia-test-runner.cs : Added support for RELAX NG compact syntax
|
||||
|
||||
@@ -20,7 +20,6 @@ Console.WriteLine ("Finished: " + DateTime.Now.ToString ("yyyy-MM-dd HH:mm:ss.ff
|
||||
foreach (DirectoryInfo di in
|
||||
new DirectoryInfo (@"relax-ng").GetDirectories ()) {
|
||||
|
||||
/*
|
||||
if (di.Name == "056") // baseURI
|
||||
continue;
|
||||
if (di.Name == "102") // invalid URI fragment
|
||||
@@ -29,7 +28,6 @@ if (di.Name == "208") // infinite loop!!
|
||||
continue;
|
||||
if (di.Name == "210") // infinite loop!!
|
||||
continue;
|
||||
*/
|
||||
|
||||
XmlTextReader xtr = null;
|
||||
FileInfo fi = new FileInfo (di.FullName + "/i.rng");
|
||||
@@ -42,9 +40,9 @@ if (di.Name == "210") // infinite loop!!
|
||||
} catch (RelaxngException ex) {
|
||||
} catch (XmlException ex) {
|
||||
} catch (ArgumentNullException ex) {
|
||||
} catch (UriFormatException ex) {
|
||||
} catch (Exception ex) {
|
||||
Console.WriteLine ("Unexpected error type : " + di.Name + " : " + ex.Message);
|
||||
// } catch (UriFormatException ex) {
|
||||
// } catch (Exception ex) {
|
||||
// Console.WriteLine ("Unexpected error type : " + di.Name + " : " + ex.Message);
|
||||
} finally {
|
||||
xtr.Close ();
|
||||
}
|
||||
@@ -57,9 +55,9 @@ if (di.Name == "210") // infinite loop!!
|
||||
try {
|
||||
p = RelaxngPattern.Read (xtr);
|
||||
p.Compile ();
|
||||
} catch (Exception ex) {
|
||||
Console.WriteLine ("Invalidated grammar: " + di.Name + " : " + ex.Message);
|
||||
continue;
|
||||
// } catch (Exception ex) {
|
||||
// Console.WriteLine ("Invalidated grammar: " + di.Name + " : " + ex.Message);
|
||||
// continue;
|
||||
} finally {
|
||||
xtr.Close ();
|
||||
}
|
||||
|
||||
@@ -7,27 +7,6 @@
|
||||
// (C) 2003 Ximian, Inc. http://www.ximian.com
|
||||
//
|
||||
|
||||
//
|
||||
// Permission is hereby granted, free of charge, to any person obtaining
|
||||
// a copy of this software and associated documentation files (the
|
||||
// "Software"), to deal in the Software without restriction, including
|
||||
// without limitation the rights to use, copy, modify, merge, publish,
|
||||
// distribute, sublicense, and/or sell copies of the Software, and to
|
||||
// permit persons to whom the Software is furnished to do so, subject to
|
||||
// the following conditions:
|
||||
//
|
||||
// The above copyright notice and this permission notice shall be
|
||||
// included in all copies or substantial portions of the Software.
|
||||
//
|
||||
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
||||
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
|
||||
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
|
||||
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
||||
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
//
|
||||
|
||||
using System;
|
||||
using System.Reflection;
|
||||
using System.Runtime.InteropServices;
|
||||
|
||||
@@ -8,27 +8,6 @@
|
||||
// (C) 2001 - 2003 Ximian, Inc (http://www.ximian.com)
|
||||
//
|
||||
|
||||
//
|
||||
// Permission is hereby granted, free of charge, to any person obtaining
|
||||
// a copy of this software and associated documentation files (the
|
||||
// "Software"), to deal in the Software without restriction, including
|
||||
// without limitation the rights to use, copy, modify, merge, publish,
|
||||
// distribute, sublicense, and/or sell copies of the Software, and to
|
||||
// permit persons to whom the Software is furnished to do so, subject to
|
||||
// the following conditions:
|
||||
//
|
||||
// The above copyright notice and this permission notice shall be
|
||||
// included in all copies or substantial portions of the Software.
|
||||
//
|
||||
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
||||
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
|
||||
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
|
||||
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
||||
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
//
|
||||
|
||||
internal sealed class Locale {
|
||||
|
||||
private Locale ()
|
||||
|
||||
@@ -6,27 +6,6 @@
|
||||
// (C) 2002 Jackson Harper, All rights reserved.
|
||||
//
|
||||
|
||||
//
|
||||
// Permission is hereby granted, free of charge, to any person obtaining
|
||||
// a copy of this software and associated documentation files (the
|
||||
// "Software"), to deal in the Software without restriction, including
|
||||
// without limitation the rights to use, copy, modify, merge, publish,
|
||||
// distribute, sublicense, and/or sell copies of the Software, and to
|
||||
// permit persons to whom the Software is furnished to do so, subject to
|
||||
// the following conditions:
|
||||
//
|
||||
// The above copyright notice and this permission notice shall be
|
||||
// included in all copies or substantial portions of the Software.
|
||||
//
|
||||
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
||||
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
|
||||
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
|
||||
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
||||
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
//
|
||||
|
||||
using System;
|
||||
using System.IO;
|
||||
using System.Text;
|
||||
|
||||
@@ -6,27 +6,6 @@
|
||||
// (C) 2002 Jackson Harper, All rights reserved.
|
||||
//
|
||||
|
||||
//
|
||||
// Permission is hereby granted, free of charge, to any person obtaining
|
||||
// a copy of this software and associated documentation files (the
|
||||
// "Software"), to deal in the Software without restriction, including
|
||||
// without limitation the rights to use, copy, modify, merge, publish,
|
||||
// distribute, sublicense, and/or sell copies of the Software, and to
|
||||
// permit persons to whom the Software is furnished to do so, subject to
|
||||
// the following conditions:
|
||||
//
|
||||
// The above copyright notice and this permission notice shall be
|
||||
// included in all copies or substantial portions of the Software.
|
||||
//
|
||||
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
||||
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
|
||||
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
|
||||
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
||||
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
//
|
||||
|
||||
using System;
|
||||
using System.Text;
|
||||
|
||||
|
||||
@@ -6,27 +6,6 @@
|
||||
// (C) 2002 Jackson Harper, All rights reserved.
|
||||
//
|
||||
|
||||
//
|
||||
// Permission is hereby granted, free of charge, to any person obtaining
|
||||
// a copy of this software and associated documentation files (the
|
||||
// "Software"), to deal in the Software without restriction, including
|
||||
// without limitation the rights to use, copy, modify, merge, publish,
|
||||
// distribute, sublicense, and/or sell copies of the Software, and to
|
||||
// permit persons to whom the Software is furnished to do so, subject to
|
||||
// the following conditions:
|
||||
//
|
||||
// The above copyright notice and this permission notice shall be
|
||||
// included in all copies or substantial portions of the Software.
|
||||
//
|
||||
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
||||
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
|
||||
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
|
||||
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
||||
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
//
|
||||
|
||||
namespace Microsoft.CSharp {
|
||||
|
||||
public enum ErrorLevel {
|
||||
|
||||
@@ -6,27 +6,6 @@
|
||||
//
|
||||
// (C) Ximian, Inc. http://www.ximian.com
|
||||
//
|
||||
|
||||
//
|
||||
// Permission is hereby granted, free of charge, to any person obtaining
|
||||
// a copy of this software and associated documentation files (the
|
||||
// "Software"), to deal in the Software without restriction, including
|
||||
// without limitation the rights to use, copy, modify, merge, publish,
|
||||
// distribute, sublicense, and/or sell copies of the Software, and to
|
||||
// permit persons to whom the Software is furnished to do so, subject to
|
||||
// the following conditions:
|
||||
//
|
||||
// The above copyright notice and this permission notice shall be
|
||||
// included in all copies or substantial portions of the Software.
|
||||
//
|
||||
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
||||
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
|
||||
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
|
||||
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
||||
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
//
|
||||
using System;
|
||||
|
||||
namespace Microsoft.CSharp {
|
||||
@@ -50,9 +29,5 @@ namespace Microsoft.CSharp {
|
||||
{
|
||||
this.comment = comment;
|
||||
}
|
||||
|
||||
public string Comment {
|
||||
get { return comment; }
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -7,27 +7,6 @@
|
||||
// (C) 2003 Ximian, Inc. http://www.ximian.com
|
||||
//
|
||||
|
||||
//
|
||||
// Permission is hereby granted, free of charge, to any person obtaining
|
||||
// a copy of this software and associated documentation files (the
|
||||
// "Software"), to deal in the Software without restriction, including
|
||||
// without limitation the rights to use, copy, modify, merge, publish,
|
||||
// distribute, sublicense, and/or sell copies of the Software, and to
|
||||
// permit persons to whom the Software is furnished to do so, subject to
|
||||
// the following conditions:
|
||||
//
|
||||
// The above copyright notice and this permission notice shall be
|
||||
// included in all copies or substantial portions of the Software.
|
||||
//
|
||||
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
||||
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
|
||||
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
|
||||
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
||||
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
//
|
||||
|
||||
using System;
|
||||
using System.Reflection;
|
||||
using System.Runtime.InteropServices;
|
||||
|
||||
@@ -8,27 +8,6 @@
|
||||
// (C) 2001 - 2003 Ximian, Inc (http://www.ximian.com)
|
||||
//
|
||||
|
||||
//
|
||||
// Permission is hereby granted, free of charge, to any person obtaining
|
||||
// a copy of this software and associated documentation files (the
|
||||
// "Software"), to deal in the Software without restriction, including
|
||||
// without limitation the rights to use, copy, modify, merge, publish,
|
||||
// distribute, sublicense, and/or sell copies of the Software, and to
|
||||
// permit persons to whom the Software is furnished to do so, subject to
|
||||
// the following conditions:
|
||||
//
|
||||
// The above copyright notice and this permission notice shall be
|
||||
// included in all copies or substantial portions of the Software.
|
||||
//
|
||||
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
||||
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
|
||||
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
|
||||
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
||||
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
//
|
||||
|
||||
internal sealed class Locale {
|
||||
|
||||
private Locale ()
|
||||
|
||||
@@ -6,27 +6,6 @@
|
||||
//
|
||||
// (C) Ximian, Inc. http://www.ximian.com
|
||||
//
|
||||
|
||||
//
|
||||
// Permission is hereby granted, free of charge, to any person obtaining
|
||||
// a copy of this software and associated documentation files (the
|
||||
// "Software"), to deal in the Software without restriction, including
|
||||
// without limitation the rights to use, copy, modify, merge, publish,
|
||||
// distribute, sublicense, and/or sell copies of the Software, and to
|
||||
// permit persons to whom the Software is furnished to do so, subject to
|
||||
// the following conditions:
|
||||
//
|
||||
// The above copyright notice and this permission notice shall be
|
||||
// included in all copies or substantial portions of the Software.
|
||||
//
|
||||
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
||||
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
|
||||
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
|
||||
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
||||
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
//
|
||||
using System;
|
||||
|
||||
/// <summary>
|
||||
|
||||
-21
@@ -7,27 +7,6 @@
|
||||
// (C) 2003 Martin Willemoes Hansen
|
||||
//
|
||||
|
||||
//
|
||||
// Permission is hereby granted, free of charge, to any person obtaining
|
||||
// a copy of this software and associated documentation files (the
|
||||
// "Software"), to deal in the Software without restriction, including
|
||||
// without limitation the rights to use, copy, modify, merge, publish,
|
||||
// distribute, sublicense, and/or sell copies of the Software, and to
|
||||
// permit persons to whom the Software is furnished to do so, subject to
|
||||
// the following conditions:
|
||||
//
|
||||
// The above copyright notice and this permission notice shall be
|
||||
// included in all copies or substantial portions of the Software.
|
||||
//
|
||||
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
||||
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
|
||||
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
|
||||
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
||||
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
//
|
||||
|
||||
namespace System.Runtime.InteropServices.CustomMarshalers
|
||||
{
|
||||
public class EnumerableToDispatchMarshaler : ICustomMarshaler {
|
||||
|
||||
-21
@@ -7,27 +7,6 @@
|
||||
// (C) 2003 Martin Willemoes Hansen
|
||||
//
|
||||
|
||||
//
|
||||
// Permission is hereby granted, free of charge, to any person obtaining
|
||||
// a copy of this software and associated documentation files (the
|
||||
// "Software"), to deal in the Software without restriction, including
|
||||
// without limitation the rights to use, copy, modify, merge, publish,
|
||||
// distribute, sublicense, and/or sell copies of the Software, and to
|
||||
// permit persons to whom the Software is furnished to do so, subject to
|
||||
// the following conditions:
|
||||
//
|
||||
// The above copyright notice and this permission notice shall be
|
||||
// included in all copies or substantial portions of the Software.
|
||||
//
|
||||
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
||||
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
|
||||
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
|
||||
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
||||
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
//
|
||||
|
||||
namespace System.Runtime.InteropServices.CustomMarshalers
|
||||
{
|
||||
public class EnumeratorToEnumVariantMarshaler : ICustomMarshaler {
|
||||
|
||||
-21
@@ -7,27 +7,6 @@
|
||||
// (C) 2003 Martin Willemoes Hansen
|
||||
//
|
||||
|
||||
//
|
||||
// Permission is hereby granted, free of charge, to any person obtaining
|
||||
// a copy of this software and associated documentation files (the
|
||||
// "Software"), to deal in the Software without restriction, including
|
||||
// without limitation the rights to use, copy, modify, merge, publish,
|
||||
// distribute, sublicense, and/or sell copies of the Software, and to
|
||||
// permit persons to whom the Software is furnished to do so, subject to
|
||||
// the following conditions:
|
||||
//
|
||||
// The above copyright notice and this permission notice shall be
|
||||
// included in all copies or substantial portions of the Software.
|
||||
//
|
||||
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
||||
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
|
||||
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
|
||||
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
||||
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
//
|
||||
|
||||
namespace System.Runtime.InteropServices.CustomMarshalers
|
||||
{
|
||||
public class ExpandoToDispatchExMarshaler : ICustomMarshaler {
|
||||
|
||||
-21
@@ -7,27 +7,6 @@
|
||||
// (C) 2003 Martin Willemoes Hansen
|
||||
//
|
||||
|
||||
//
|
||||
// Permission is hereby granted, free of charge, to any person obtaining
|
||||
// a copy of this software and associated documentation files (the
|
||||
// "Software"), to deal in the Software without restriction, including
|
||||
// without limitation the rights to use, copy, modify, merge, publish,
|
||||
// distribute, sublicense, and/or sell copies of the Software, and to
|
||||
// permit persons to whom the Software is furnished to do so, subject to
|
||||
// the following conditions:
|
||||
//
|
||||
// The above copyright notice and this permission notice shall be
|
||||
// included in all copies or substantial portions of the Software.
|
||||
//
|
||||
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
||||
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
|
||||
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
|
||||
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
||||
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
//
|
||||
|
||||
namespace System.Runtime.InteropServices.CustomMarshalers
|
||||
{
|
||||
public class TypeToTypeInfoMarshaler : ICustomMarshaler {
|
||||
|
||||
@@ -219,7 +219,7 @@ public class CP51932 : Encoding
|
||||
value -= 0x0100;
|
||||
bytes [posn++] = (byte) (value / 0x5E + 0xA1);
|
||||
bytes [posn++] = (byte) (value % 0x5E + 0xA1);
|
||||
//Console.WriteLine ("{0:X04}", ch);
|
||||
Console.WriteLine ("{0:X04}", ch);
|
||||
continue;
|
||||
}
|
||||
else
|
||||
|
||||
@@ -122,8 +122,6 @@ public class Manager
|
||||
e = Instantiate (alias) as Encoding;
|
||||
}
|
||||
}
|
||||
if (e == null)
|
||||
return null;
|
||||
|
||||
// e.g. Neither euc_jp nor shift-jis not allowed (Normalize() badness)
|
||||
if (orgName.IndexOf ('_') > 0 && e.WebName.IndexOf ('-') > 0)
|
||||
|
||||
@@ -1,24 +1,3 @@
|
||||
|
||||
//
|
||||
// Permission is hereby granted, free of charge, to any person obtaining
|
||||
// a copy of this software and associated documentation files (the
|
||||
// "Software"), to deal in the Software without restriction, including
|
||||
// without limitation the rights to use, copy, modify, merge, publish,
|
||||
// distribute, sublicense, and/or sell copies of the Software, and to
|
||||
// permit persons to whom the Software is furnished to do so, subject to
|
||||
// the following conditions:
|
||||
//
|
||||
// The above copyright notice and this permission notice shall be
|
||||
// included in all copies or substantial portions of the Software.
|
||||
//
|
||||
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
||||
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
|
||||
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
|
||||
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
||||
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
//
|
||||
using System.Reflection;
|
||||
using System.Runtime.CompilerServices;
|
||||
|
||||
|
||||
@@ -2,8 +2,6 @@
|
||||
./IBM.Data.DB2/DB2ClientUtils.cs
|
||||
./IBM.Data.DB2/DB2CLIWrapper.cs
|
||||
./IBM.Data.DB2/DB2Command.cs
|
||||
./IBM.Data.DB2/DB2CommandBuilder.cs
|
||||
./IBM.Data.DB2/DB2OpenConnection.cs
|
||||
./IBM.Data.DB2/DB2Connection.cs
|
||||
./IBM.Data.DB2/DB2ConnectionPool.cs
|
||||
./IBM.Data.DB2/DB2ConnectionSettings.cs
|
||||
@@ -11,15 +9,16 @@
|
||||
./IBM.Data.DB2/DB2DataAdapter.cs
|
||||
./IBM.Data.DB2/DB2DataReader.cs
|
||||
./IBM.Data.DB2/DB2Environment.cs
|
||||
./IBM.Data.DB2/DB2Error.cs
|
||||
./IBM.Data.DB2/DB2ErrorCollection.cs
|
||||
./IBM.Data.DB2/DB2Error.cs
|
||||
./IBM.Data.DB2/DB2Exception.cs
|
||||
./IBM.Data.DB2/DB2InfoMessageEventHandler.cs
|
||||
./IBM.Data.DB2/DB2Parameter.cs
|
||||
./IBM.Data.DB2/DB2InfoMessageEventArgs.cs
|
||||
./IBM.Data.DB2/DB2OpenConnection.cs
|
||||
./IBM.Data.DB2/DB2ParameterCollection.cs
|
||||
./IBM.Data.DB2/DB2Parameter.cs
|
||||
./IBM.Data.DB2/DB2RowUpdatedEventArgs.cs
|
||||
./IBM.Data.DB2/DB2RowUpdatedEventHandler.cs
|
||||
./IBM.Data.DB2/DB2RowUpdatingEventArgs.cs
|
||||
./IBM.Data.DB2/DB2RowUpdatingEventHandler.cs
|
||||
./IBM.Data.DB2/DB2Transaction.cs
|
||||
./IBM.Data.DB2/DB2Type.cs
|
||||
./IBM.Data.DB2/DB2Type.cs
|
||||
@@ -1,24 +1,3 @@
|
||||
|
||||
//
|
||||
// Permission is hereby granted, free of charge, to any person obtaining
|
||||
// a copy of this software and associated documentation files (the
|
||||
// "Software"), to deal in the Software without restriction, including
|
||||
// without limitation the rights to use, copy, modify, merge, publish,
|
||||
// distribute, sublicense, and/or sell copies of the Software, and to
|
||||
// permit persons to whom the Software is furnished to do so, subject to
|
||||
// the following conditions:
|
||||
//
|
||||
// The above copyright notice and this permission notice shall be
|
||||
// included in all copies or substantial portions of the Software.
|
||||
//
|
||||
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
||||
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
|
||||
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
|
||||
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
||||
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
//
|
||||
using System;
|
||||
using System.Data;
|
||||
using System.Runtime.InteropServices;
|
||||
@@ -30,134 +9,6 @@ namespace IBM.Data.DB2
|
||||
/// DB2Prototypes class is a wrapper for the DB2.lib, IBM's Call Level Interface to DB2
|
||||
/// </summary>
|
||||
///
|
||||
#region comented
|
||||
/*internal class DB2CLIWrapper
|
||||
{
|
||||
|
||||
#if (OS_LINUX)
|
||||
private const string libname = "db2_36";
|
||||
#endif
|
||||
|
||||
#if (OS_WINDOWS)
|
||||
private const string libname = "db2cli";
|
||||
#endif
|
||||
|
||||
[DllImport("db2cli", EntryPoint = "SQLAllocHandle")]
|
||||
internal static extern short SQLAllocHandle(short handleType, IntPtr inputHandle, ref IntPtr outputHandle);
|
||||
|
||||
[DllImport("db2cli", EntryPoint = "SQLFreeHandle")]
|
||||
internal static extern short SQLFreeHandle(short handleType, IntPtr inputHandle);
|
||||
|
||||
[DllImport("db2cli", EntryPoint = "SQLGetConnectAttrW")]
|
||||
internal static extern short SQLGetConnectAttr(IntPtr ConnectionHandle, int Attribute, [Out] IntPtr ValuePtr, int BufferLength, out int StringLengthPtr);
|
||||
|
||||
[DllImport("db2cli", EntryPoint = "SQLGetConnectAttrW")]
|
||||
internal static extern short SQLGetConnectAttr(IntPtr ConnectionHandle, int Attribute, out int Value, int BufferLength, IntPtr Zero);
|
||||
|
||||
[DllImport("db2cli", EntryPoint = "SQLFreeStmt")]
|
||||
internal static extern short SQLFreeStmt(IntPtr StatementHandle, short option);
|
||||
|
||||
[DllImport("db2cli", EntryPoint = "SQLConnect")]
|
||||
internal static extern short SQLConnect(IntPtr sqlHdbc, string serverName, short serverNameLength, string userName, short userNameLength, string authentication, short authenticationLength);
|
||||
[DllImport("db2cli", EntryPoint = "SQLColAttribute")]
|
||||
internal static extern short SQLColAttribute(IntPtr StatementHandle, short ColumnNumber, short FieldIdentifier, IntPtr CharacterAttribute, short BufferLength, ref short StringLength, ref int NumericAttribute);
|
||||
//[DllImport("db2cli", EntryPoint = "SQLGetData")]
|
||||
// internal static extern short SQLGetData(IntPtr StatementHandle, short ColumnNumber, short TargetType, IntPtr TargetPtr, IntPtr BufferLength, ref IntPtr StrLen_or_Ind);
|
||||
[DllImport("db2cli", EntryPoint="SQLMoreResults")]
|
||||
internal static extern short SQLMoreResults(IntPtr StatementHandle);
|
||||
|
||||
//[DllImport("db2cli", EntryPoint = "SQLGetData")]
|
||||
//internal static extern short SQLGetData(IntPtr StatementHandle, short ColumnNumber, short TargetType, IntPtr TargetPtr, IntPtr BufferLength, out int StrLen_or_Ind);
|
||||
[DllImport("db2cli", EntryPoint = "SQLGetData")]
|
||||
internal static extern short SQLGetData(IntPtr StatementHandle, short ColumnNumber, short TargetType, IntPtr TargetPtr, int BufferLength, out int StrLen_or_Ind);
|
||||
|
||||
|
||||
//[DllImport("db2cli", EntryPoint = "SQLGetData")]
|
||||
//internal static extern short SQLGetData(IntPtr StatementHandle, short ColumnNumber, short TargetType, byte[] TargetPtr, IntPtr BufferLength, ref IntPtr StrLen_or_Ind);
|
||||
|
||||
[DllImport("db2cli", EntryPoint = "SQLGetData")]
|
||||
internal static extern short SQLGetData(IntPtr StatementHandle, short ColumnNumber, short TargetType, byte[] TargetPtr, int BufferLength, out int StrLen_or_Ind);
|
||||
|
||||
[DllImport("db2cli", EntryPoint = "SQLGetData")]
|
||||
internal static extern short SQLGetData(IntPtr StatementHandle, short ColumnNumber, short TargetType, [Out] StringBuilder sb, int BufferLength, out int StrLen_or_Ind);
|
||||
|
||||
[DllImport("db2cli", EntryPoint = "SQLColAttributeW")]
|
||||
internal static extern short SQLColAttribute(IntPtr StatementHandle, short ColumnNumber, short FieldIdentifier, [Out] StringBuilder CharacterAttribute, short BufferLength, out short StringLength, out int NumericAttribute);
|
||||
|
||||
[DllImport("db2cli", CharSet = CharSet.Auto, EntryPoint = "SQLDisconnect")]
|
||||
internal static extern short SQLDisconnect(IntPtr sqlHdbc);
|
||||
[DllImport("db2cli", EntryPoint = "SQLGetDiagRec")]
|
||||
internal static extern short SQLGetDiagRec( short handleType, IntPtr handle, short recNum, [Out] StringBuilder sqlState, ref IntPtr nativeErrorPtr, [Out] StringBuilder errorMessage, short bufferLength, ref IntPtr shortTextLengthPtr);
|
||||
[DllImport("db2cli", EntryPoint = "SQLSetConnectAttr")]
|
||||
internal static extern short SQLSetConnectAttr(IntPtr sqlHdbc, long sqlAttr, [In] IntPtr sqlValuePtr, long sqlValueLength);
|
||||
[DllImport("db2cli", EntryPoint = "SQLSetStmtAttr")]
|
||||
internal static extern short SQLSetStmtAttr(IntPtr sqlHstmt, long sqlAttr, [In] IntPtr sqlValuePtr, long sqlValueLength);
|
||||
[DllImport("db2cli", EntryPoint = "SQLEndTran")]
|
||||
internal static extern short SQLEndTran (short handleType, IntPtr handle, short fType);
|
||||
[DllImport("db2cli", EntryPoint = "SQLCancel")]
|
||||
internal static extern short SQLCancel(IntPtr handle);
|
||||
[DllImport("db2cli", EntryPoint = "SQLNumResultCols")]
|
||||
internal static extern short SQLNumResultCols(IntPtr handle, ref int numCols);
|
||||
[DllImport("db2cli", EntryPoint = "SQLFetch")]
|
||||
internal static extern short SQLFetch(IntPtr handle);
|
||||
[DllImport("db2cli", EntryPoint = "SQLRowCount")]
|
||||
internal static extern short SQLRowCount(IntPtr stmtHandle, ref int numRows);
|
||||
[DllImport("db2cli", EntryPoint = "SQLExecute")]
|
||||
internal static extern short SQLExecute(IntPtr handle);
|
||||
[DllImport ("db2cli", EntryPoint = "SQLExecDirect")]
|
||||
internal static extern short SQLExecDirect(IntPtr stmtHandle, string stmt, int length);
|
||||
[DllImport("db2cli", EntryPoint = "SQLDescribeCol")]
|
||||
internal static extern short SQLDescribeCol(IntPtr stmtHandle, ushort colNum, StringBuilder colName, short colNameMaxLength, IntPtr colNameLength, ref IntPtr dataType, ref IntPtr colSizePtr, ref IntPtr scalePtr, ref IntPtr nullablePtr );
|
||||
[DllImport("db2cli", EntryPoint = "SQLBindCol")]
|
||||
internal static extern short SQLBindCol(IntPtr StatementHandle, short ColumnNumber, short TargetType, IntPtr TargetValue, IntPtr BufferLength, ref IntPtr StrLen_or_Ind);
|
||||
[DllImport("db2cli", EntryPoint = "SQLDriverConnect")]
|
||||
internal static extern short SQLDriverConnect(IntPtr hdbc, int centered, [In] string inConnectStr, [In] int inStrLength, [Out] StringBuilder outConnectStr, [Out] int outStrCapacity, [Out] IntPtr outStrLengthReturned, [In] int completion);
|
||||
[DllImport("db2cli", EntryPoint = "SQLPrepare")]
|
||||
internal static extern short SQLPrepare(IntPtr stmtHandle, string stmt, int length);
|
||||
[DllImport("db2cli", EntryPoint = "SQLDescribeParam")]
|
||||
internal static extern short SQLDescribeParam(IntPtr stmtHandle, short paramNumber,ref IntPtr dataType, ref IntPtr paramSize, ref IntPtr decimalDigits, ref IntPtr nullable);
|
||||
[DllImport("db2cli", EntryPoint = "SQLNumParams")]
|
||||
internal static extern short SQLNumParams(IntPtr stmtHandle, ref IntPtr numParams);
|
||||
|
||||
[DllImport("db2cli")]
|
||||
internal static extern short SQLBindParameter(IntPtr stmtHandle, ushort paramNumber,
|
||||
short dataType, short valueType, short paramType, uint colSize, short decDigits,
|
||||
IntPtr dataBufferPtr, int dataBufferLength, IntPtr StrLen_or_IndPtr);
|
||||
|
||||
[DllImport("db2cli")]
|
||||
internal static extern short SQLBindParameter(IntPtr stmtHandle, ushort paramNumber,
|
||||
short dataType, short valueType, short paramType, uint colSize, short decDigits,
|
||||
byte[] dataBufferPtr, int dataBufferLength, IntPtr StrLen_or_IndPtr);
|
||||
|
||||
[DllImport("db2cli", EntryPoint = "SQLBindParameter")]
|
||||
internal static extern short SQLBindParameter(IntPtr stmtHandle, ushort paramNumber,
|
||||
short dataType, short valueType, short paramType, uint colSize, short decDigits,
|
||||
ref int dataBufferPtr, int dataBufferLength, IntPtr StrLen_or_IndPtr);
|
||||
|
||||
[DllImport("db2cli", EntryPoint = "SQLBindParameter")]
|
||||
internal static extern short SQLBindParameter(IntPtr stmtHandle, ushort paramNumber,
|
||||
short dataType, short valueType, short paramType, uint colSize, short decDigits,
|
||||
ref double dataBufferPtr, int dataBufferLength, IntPtr StrLen_or_IndPtr);
|
||||
|
||||
[DllImport("db2cli", EntryPoint = "SQLDescribeParam")]
|
||||
internal static extern short SQLDescribeParam(IntPtr stmtHandle, short ParameterNumber, IntPtr DataTypePtr, IntPtr ParameterSizePtr, IntPtr DecimalDigitsPtr, IntPtr NullablePtr);
|
||||
|
||||
[DllImport("db2cli", EntryPoint = "SQLGetLength")]
|
||||
internal static extern short SQLGetLength( IntPtr stmtHandle, short locatorCType, int Locator,
|
||||
IntPtr stringLength, IntPtr indicatorValue);
|
||||
[DllImport("db2cli", EntryPoint = "SQLGetPosition")]
|
||||
internal static extern short SQLGetPosition(IntPtr stmtHandle, short locatorCType, int sourceLocator, int searchLocator,
|
||||
string searchLiteral, int searchLiteralLength, uint fromPosition, IntPtr locatedAt, IntPtr indicatorValue);
|
||||
[DllImport("db2cli", EntryPoint = "SQLGetPosition")]
|
||||
internal static extern short SQLBindFileToCol (IntPtr stmtHandle, ushort colNum, string fileName, IntPtr fileNameLength,
|
||||
IntPtr fileOptions, short maxFileNameLength, IntPtr stringLength, IntPtr indicatorValue);
|
||||
[DllImport("db2cli", EntryPoint = "SQLGetPosition")]
|
||||
internal static extern short SQLBindFileToParam (IntPtr stmtHandle, ushort targetType, short dataType, string fileName,
|
||||
IntPtr fileNameLength, short maxFileNameLength, IntPtr indicatorValue);
|
||||
|
||||
|
||||
}*/
|
||||
#endregion
|
||||
|
||||
internal class DB2CLIWrapper
|
||||
{
|
||||
@@ -165,14 +16,16 @@ namespace IBM.Data.DB2
|
||||
|
||||
static public short Initialize(ref IntPtr pEnvHandle)
|
||||
{
|
||||
string OSVersion = Environment.OSVersion.ToString();
|
||||
useLibCli = true;
|
||||
if(OSVersion.Substring(0,4)=="Unix"){
|
||||
useLibCli = false;
|
||||
useLibCli = false;
|
||||
try
|
||||
{
|
||||
return DB2CLIWrapper.SQLAllocHandle(DB2Constants.SQL_HANDLE_ENV, IntPtr.Zero, out pEnvHandle);
|
||||
}
|
||||
return DB2CLIWrapper.SQLAllocHandle(DB2Constants.SQL_HANDLE_ENV, IntPtr.Zero, out pEnvHandle);
|
||||
catch {}
|
||||
useLibCli = false;
|
||||
return DB2CLIWrapper.SQLAllocHandle(DB2Constants.SQL_HANDLE_ENV, IntPtr.Zero, out pEnvHandle);
|
||||
}
|
||||
|
||||
|
||||
static public short SQLAllocHandle(short handleType, IntPtr inputHandle, out IntPtr outputHandle)
|
||||
{
|
||||
if(useLibCli)
|
||||
@@ -269,15 +122,6 @@ namespace IBM.Data.DB2
|
||||
return StaticWrapperCli.SQLSetStmtAttr(sqlHdbc, sqlAttr, sqlValuePtr, sqlValueLength);
|
||||
return StaticWrapper36.SQLSetStmtAttr(sqlHdbc, sqlAttr, sqlValuePtr, sqlValueLength);
|
||||
}
|
||||
|
||||
//for bulk operations
|
||||
static public short SQLSetStmtAttr(IntPtr sqlHdbc, int sqlAttr, ushort[] sqlValuePtr, int sqlValueLength)
|
||||
{
|
||||
if(useLibCli)
|
||||
return StaticWrapperCli.SQLSetStmtAttr(sqlHdbc, sqlAttr, sqlValuePtr, sqlValueLength);
|
||||
return StaticWrapper36.SQLSetStmtAttr(sqlHdbc, sqlAttr, sqlValuePtr, sqlValueLength);
|
||||
}
|
||||
|
||||
static public short SQLEndTran (short handleType, IntPtr handle, short fType)
|
||||
{
|
||||
if(useLibCli)
|
||||
@@ -338,13 +182,6 @@ namespace IBM.Data.DB2
|
||||
return StaticWrapperCli.SQLBindParameter(stmtHandle, paramNumber, dataType, valueType, paramType, colSize, decDigits, dataBufferPtr, dataBufferLength, StrLen_or_IndPtr);
|
||||
return StaticWrapper36.SQLBindParameter(stmtHandle, paramNumber, dataType, valueType, paramType, colSize, decDigits, dataBufferPtr, dataBufferLength, StrLen_or_IndPtr);
|
||||
}
|
||||
|
||||
static public short SQLBindParameter(IntPtr stmtHandle, short paramNumber, short dataType, short valueType, short paramType, int colSize, short decDigits, int[] dataBufferPtr, int dataBufferLength, IntPtr StrLen_or_IndPtr)
|
||||
{
|
||||
if(useLibCli)
|
||||
return StaticWrapperCli.SQLBindParameter(stmtHandle, paramNumber, dataType, valueType, paramType, colSize, decDigits, dataBufferPtr, dataBufferLength, StrLen_or_IndPtr);
|
||||
return StaticWrapper36.SQLBindParameter(stmtHandle, paramNumber, dataType, valueType, paramType, colSize, decDigits, dataBufferPtr, dataBufferLength, StrLen_or_IndPtr);
|
||||
}
|
||||
public static short SQLGetInfo(IntPtr sqlHdbc, short fInfoType, [Out] StringBuilder rgbInfoValue, short cbInfoValueMax, out short pcbInfoValue)
|
||||
{
|
||||
if(useLibCli)
|
||||
@@ -401,14 +238,8 @@ namespace IBM.Data.DB2
|
||||
|
||||
[DllImport(libname, EntryPoint = "SQLSetConnectAttr")]
|
||||
public static extern short SQLSetConnectAttr(IntPtr sqlHdbc, int sqlAttr, [In] IntPtr sqlValuePtr, int sqlValueLength);
|
||||
|
||||
[DllImport(libname, EntryPoint = "SQLSetStmtAttr")]
|
||||
public static extern short SQLSetStmtAttr(IntPtr sqlHdbc, int sqlAttr, [In] IntPtr sqlValuePtr, int sqlValueLength);
|
||||
|
||||
//For bulk operations
|
||||
[DllImport(libname, EntryPoint = "SQLSetStmtAttr")]
|
||||
public static extern short SQLSetStmtAttr(IntPtr sqlHdbc, int sqlAttr, ushort[] sqlValuePtr, int sqlValueLength);
|
||||
|
||||
[DllImport(libname, EntryPoint = "SQLEndTran")]
|
||||
public static extern short SQLEndTran (short handleType, IntPtr handle, short fType);
|
||||
[DllImport(libname, EntryPoint = "SQLCancel")]
|
||||
@@ -431,12 +262,6 @@ namespace IBM.Data.DB2
|
||||
public static extern short SQLBindParameter(IntPtr stmtHandle, short paramNumber,
|
||||
short dataType, short valueType, short paramType, int colSize, short decDigits,
|
||||
IntPtr dataBufferPtr, int dataBufferLength, IntPtr StrLen_or_IndPtr);
|
||||
|
||||
[DllImport(libname)]
|
||||
public static extern short SQLBindParameter(IntPtr stmtHandle, short paramNumber,
|
||||
short dataType, short valueType, short paramType, int colSize, short decDigits,
|
||||
int[] dataBufferPtr, int dataBufferLength, IntPtr StrLen_or_IndPtr);
|
||||
|
||||
[DllImport(libname, EntryPoint = "SQLGetInfoW", CharSet=CharSet.Unicode)]
|
||||
public static extern short SQLGetInfo(IntPtr sqlHdbc, short fInfoType, [Out] StringBuilder rgbInfoValue, short cbInfoValueMax, out short pcbInfoValue);
|
||||
}
|
||||
@@ -453,7 +278,7 @@ namespace IBM.Data.DB2
|
||||
[DllImport(libname, EntryPoint = "SQLFreeStmt")]
|
||||
public static extern short SQLFreeStmt(IntPtr StatementHandle, short option);
|
||||
|
||||
[DllImport(libname, EntryPoint = "SQLConnect", CharSet=CharSet.Ansi)]
|
||||
[DllImport(libname, EntryPoint = "SQLConnect")]
|
||||
|
||||
public static extern short SQLConnect(IntPtr sqlHdbc, string serverName, short serverNameLength, string userName, short userNameLength, string authentication, short authenticationLength);
|
||||
[DllImport(libname, EntryPoint = "SQLColAttributeW", CharSet=CharSet.Unicode)]
|
||||
@@ -489,11 +314,6 @@ namespace IBM.Data.DB2
|
||||
public static extern short SQLSetConnectAttr(IntPtr sqlHdbc, int sqlAttr, [In] IntPtr sqlValuePtr, int sqlValueLength);
|
||||
[DllImport(libname, EntryPoint = "SQLSetStmtAttr")]
|
||||
public static extern short SQLSetStmtAttr(IntPtr sqlHdbc, int sqlAttr, [In] IntPtr sqlValuePtr, int sqlValueLength);
|
||||
|
||||
//for bulk operations
|
||||
[DllImport(libname, EntryPoint = "SQLSetStmtAttr")]
|
||||
public static extern short SQLSetStmtAttr(IntPtr sqlHdbc, int sqlAttr, ushort[] sqlValuePtr, int sqlValueLength);
|
||||
|
||||
[DllImport(libname, EntryPoint = "SQLEndTran")]
|
||||
public static extern short SQLEndTran (short handleType, IntPtr handle, short fType);
|
||||
[DllImport(libname, EntryPoint = "SQLCancel")]
|
||||
@@ -516,13 +336,7 @@ namespace IBM.Data.DB2
|
||||
public static extern short SQLBindParameter(IntPtr stmtHandle, short paramNumber,
|
||||
short dataType, short valueType, short paramType, int colSize, short decDigits,
|
||||
IntPtr dataBufferPtr, int dataBufferLength, IntPtr StrLen_or_IndPtr);
|
||||
|
||||
[DllImport(libname)]
|
||||
public static extern short SQLBindParameter(IntPtr stmtHandle, short paramNumber,
|
||||
short dataType, short valueType, short paramType, int colSize, short decDigits,
|
||||
int[] dataBufferPtr, int dataBufferLength, IntPtr StrLen_or_IndPtr);
|
||||
|
||||
[DllImport(libname, EntryPoint = "SQLGetInfoW", CharSet=CharSet.Unicode)]
|
||||
[DllImport(libname, EntryPoint = "SQLGetInfo")]
|
||||
public static extern short SQLGetInfo(IntPtr sqlHdbc, short fInfoType, [Out] StringBuilder rgbInfoValue, short cbInfoValueMax, out short pcbInfoValue);
|
||||
|
||||
}
|
||||
|
||||
Loaded 100 of 5843 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user