aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2013-05-30 19:55:18 -0400
committerBoris Kolpackov <boris@codesynthesis.com>2013-05-30 19:55:18 -0400
commit93dfe8d00dc4ea19b31ebcf4dab35a32cd1d6791 (patch)
treedb4d7ccab16a4ba7c84c5cd0673e9b638b354017
parent3c55d0d6934cb037a5fb2b5729b6603d8b7ca7e5 (diff)
Get rid of dependency on Boost filesystem
-rw-r--r--INSTALL1
-rw-r--r--build/import/libboost/LICENSE340
-rw-r--r--build/import/libboost/configuration-rules.make15
-rwxr-xr-xbuild/import/libboost/configure74
-rw-r--r--build/import/libboost/filesystem/rules.make53
-rw-r--r--build/import/libboost/filesystem/stub.make36
-rw-r--r--build/import/libboost/version1
-rw-r--r--build/import/libxsd-frontend/stub.make2
-rw-r--r--tests/dump/driver.cxx2
-rw-r--r--xsd-frontend/makefile12
-rw-r--r--xsd-frontend/parser.cxx120
-rw-r--r--xsd-frontend/semantic-graph/elements.cxx2
-rw-r--r--xsd-frontend/semantic-graph/elements.hxx13
-rw-r--r--xsd-frontend/transformations/anonymous.cxx20
-rw-r--r--xsd-frontend/transformations/schema-per-type.cxx8
15 files changed, 67 insertions, 632 deletions
diff --git a/INSTALL b/INSTALL
index 756b7e4..cd18b4b 100644
--- a/INSTALL
+++ b/INSTALL
@@ -10,7 +10,6 @@ Prerequisites
- libfrontend-elements >= 1.1.4 http://kolpackov.net/projects/libfrontend-elements/
- libcult >= 1.4.6 http://kolpackov.net/projects/libcult/
- libxerces-c >= 2.6.0 http://xerces.apache.org/xerces-c/
- - libboost_filesystem >= 1.33.1 http://boost.org
Building libxsd-frontend
diff --git a/build/import/libboost/LICENSE b/build/import/libboost/LICENSE
deleted file mode 100644
index 3912109..0000000
--- a/build/import/libboost/LICENSE
+++ /dev/null
@@ -1,340 +0,0 @@
- GNU GENERAL PUBLIC LICENSE
- Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
- 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
- Preamble
-
- The licenses for most software are designed to take away your
-freedom to share and change it. By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users. This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it. (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.) You can apply it to
-your programs, too.
-
- When we speak of free software, we are referring to freedom, not
-price. Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
- To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
- For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have. You must make sure that they, too, receive or can get the
-source code. And you must show them these terms so they know their
-rights.
-
- We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
- Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software. If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
- Finally, any free program is threatened constantly by software
-patents. We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary. To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
- The precise terms and conditions for copying, distribution and
-modification follow.
-
- GNU GENERAL PUBLIC LICENSE
- TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
- 0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License. The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language. (Hereinafter, translation is included without limitation in
-the term "modification".) Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope. The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
- 1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
- 2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
- a) You must cause the modified files to carry prominent notices
- stating that you changed the files and the date of any change.
-
- b) You must cause any work that you distribute or publish, that in
- whole or in part contains or is derived from the Program or any
- part thereof, to be licensed as a whole at no charge to all third
- parties under the terms of this License.
-
- c) If the modified program normally reads commands interactively
- when run, you must cause it, when started running for such
- interactive use in the most ordinary way, to print or display an
- announcement including an appropriate copyright notice and a
- notice that there is no warranty (or else, saying that you provide
- a warranty) and that users may redistribute the program under
- these conditions, and telling the user how to view a copy of this
- License. (Exception: if the Program itself is interactive but
- does not normally print such an announcement, your work based on
- the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole. If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works. But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
- 3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
- a) Accompany it with the complete corresponding machine-readable
- source code, which must be distributed under the terms of Sections
- 1 and 2 above on a medium customarily used for software interchange; or,
-
- b) Accompany it with a written offer, valid for at least three
- years, to give any third party, for a charge no more than your
- cost of physically performing source distribution, a complete
- machine-readable copy of the corresponding source code, to be
- distributed under the terms of Sections 1 and 2 above on a medium
- customarily used for software interchange; or,
-
- c) Accompany it with the information you received as to the offer
- to distribute corresponding source code. (This alternative is
- allowed only for noncommercial distribution and only if you
- received the program in object code or executable form with such
- an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it. For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable. However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
- 4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License. Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
- 5. You are not required to accept this License, since you have not
-signed it. However, nothing else grants you permission to modify or
-distribute the Program or its derivative works. These actions are
-prohibited by law if you do not accept this License. Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
- 6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions. You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
- 7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License. If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all. For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices. Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
- 8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded. In such case, this License incorporates
-the limitation as if written in the body of this License.
-
- 9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time. Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number. If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation. If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
- 10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission. For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this. Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
- NO WARRANTY
-
- 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
- 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
- END OF TERMS AND CONDITIONS
-
- How to Apply These Terms to Your New Programs
-
- If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
- To do so, attach the following notices to the program. It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
- <one line to give the program's name and a brief idea of what it does.>
- Copyright (C) <year> <name of author>
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
- Gnomovision version 69, Copyright (C) year name of author
- Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
- This is free software, and you are welcome to redistribute it
- under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License. Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary. Here is a sample; alter the names:
-
- Yoyodyne, Inc., hereby disclaims all copyright interest in the program
- `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
- <signature of Ty Coon>, 1 April 1989
- Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs. If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library. If this is what you want to do, use the GNU Library General
-Public License instead of this License.
diff --git a/build/import/libboost/configuration-rules.make b/build/import/libboost/configuration-rules.make
deleted file mode 100644
index df35c70..0000000
--- a/build/import/libboost/configuration-rules.make
+++ /dev/null
@@ -1,15 +0,0 @@
-# file : build/import/libboost/configuration-rules.make
-# author : Boris Kolpackov <boris@kolpackov.net>
-# copyright : Copyright (c) 2005-2011 Boris Kolpackov
-# license : GNU GPL v2; see accompanying LICENSE file
-
-$(dcf_root)/import/libboost/configuration-dynamic.make: | $(dcf_root)/import/libboost/.
- $(call message,,$(scf_root)/import/libboost/configure $@)
-
-ifndef %foreign%
-
-disfigure::
- $(call message,rm $(dcf_root)/import/libboost/configuration-dynamic.make,\
-rm -f $(dcf_root)/import/libboost/configuration-dynamic.make)
-
-endif
diff --git a/build/import/libboost/configure b/build/import/libboost/configure
deleted file mode 100755
index 7f78219..0000000
--- a/build/import/libboost/configure
+++ /dev/null
@@ -1,74 +0,0 @@
-#! /usr/bin/env bash
-
-# file : build/import/libboost/configure
-# author : Boris Kolpackov <boris@kolpackov.net>
-# copyright : Copyright (c) 2005-2011 Boris Kolpackov
-# license : GNU GPL v2; see accompanying LICENSE file
-
-
-# $1 - out config file
-#
-# bld_root - build root
-# project_name - project name
-#
-
-source $bld_root/dialog.bash
-
-
-$echo
-$echo "Configuring external dependency on 'boost libraries' for '$project_name'."
-$echo
-
-$echo
-$echo "Would you like to configure dependency on the installed version"
-$echo "of 'boost libraries' as opposed to the development build?"
-$echo
-
-installed=`read_y_n y`
-
-if [ "$installed" = "n" ]; then
-
- $echo
- $echo "Please enter the 'boost' root directory."
- $echo
-
- root=`read_path --directory --exist`
-
- $echo
- $echo "Please select the library type you would like to use:"
- $echo
- $echo "(1) archive"
- $echo "(2) shared object"
- $echo
-
- type=`read_option "archive shared" "shared"`
-fi
-
-$echo
-$echo "Link explicitly to the boost system library? This library"
-$echo "is available since boost 1.35.0 and linking to it explicitly"
-$echo "may be required by newer linkers."
-$echo
-
-link_system=`read_y_n y`
-
-$echo
-$echo "Please enter optional suffix that may be embedded into the"
-$echo "boost library names. For example, if your library names are in"
-$echo "the libboost_regex-gcc41-mt-d.so form, then enter -gcc41-mt-d"
-$echo "Otherwise leave this field blank."
-$echo
-
-suffix=
-read -e -p "[]: " suffix
-
-echo libboost_installed := $installed >$1
-echo libboost_suffix := $suffix >>$1
-echo libboost_system := $link_system >>$1
-
-if [ "$installed" = "n" ]; then
-
- echo libboost_root := $root >>$1
- echo libboost_type := $type >>$1
-
-fi
diff --git a/build/import/libboost/filesystem/rules.make b/build/import/libboost/filesystem/rules.make
deleted file mode 100644
index fa70735..0000000
--- a/build/import/libboost/filesystem/rules.make
+++ /dev/null
@@ -1,53 +0,0 @@
-# file : build/import/libboost/filesystem/rules.make
-# author : Boris Kolpackov <boris@kolpackov.net>
-# copyright : Copyright (c) 2005-2011 Boris Kolpackov
-# license : GNU GPL v2; see accompanying LICENSE file
-
-#@@ Should use message everywhere.
-#
-
-$(dcf_root)/import/libboost/%: root := $(libboost_root)
-
-$(dcf_root)/import/libboost/filesystem/filesystem.l: \
- | $(dcf_root)/import/libboost/filesystem/.
-
-ifeq ($(libboost_type),archive)
-
-ifeq ($(libboost_system),y)
-$(dcf_root)/import/libboost/filesystem/filesystem.l: \
- $(libboost_root)/stage/lib/libboost_filesystem$(libboost_suffix).a \
- $(libboost_root)/stage/lib/libboost_system$(libboost_suffix).a
-else
-$(dcf_root)/import/libboost/filesystem/filesystem.l: \
- $(libboost_root)/stage/lib/libboost_filesystem$(libboost_suffix).a
-endif
- @echo $^ >$@
-
-else
-
-ifeq ($(libboost_system),y)
-$(dcf_root)/import/libboost/filesystem/filesystem.l: \
- $(libboost_root)/stage/lib/libboost_filesystem$(libboost_suffix).so \
- $(libboost_root)/stage/lib/libboost_system$(libboost_suffix).so
-else
-$(dcf_root)/import/libboost/filesystem/filesystem.l: \
- $(libboost_root)/stage/lib/libboost_filesystem$(libboost_suffix).so
-endif
- @echo $^ >$@
- @echo rpath:$(root)/stage/lib >>$@
-
-endif
-
-
-$(dcf_root)/import/libboost/filesystem/filesystem.l.cpp-options: \
- | $(dcf_root)/import/libboost/filesystem/.
- @echo include: -I$(root) >$@
-
-ifndef %foreign%
-
-disfigure::
- $(call message,rm $(dcf_root)/import/libboost/filesystem/filesystem.l,\
-rm -f $(dcf_root)/import/libboost/filesystem/filesystem.l)
- $(call message,,rm -f $(dcf_root)/import/libboost/filesystem/filesystem.l.cpp-options)
-
-endif
diff --git a/build/import/libboost/filesystem/stub.make b/build/import/libboost/filesystem/stub.make
deleted file mode 100644
index 76ad55e..0000000
--- a/build/import/libboost/filesystem/stub.make
+++ /dev/null
@@ -1,36 +0,0 @@
-# file : build/import/libboost/filesystem/stub.make
-# author : Boris Kolpackov <boris@kolpackov.net>
-# copyright : Copyright (c) 2005-2011 Boris Kolpackov
-# license : GNU GPL v2; see accompanying LICENSE file
-
-$(call include-once,$(scf_root)/import/libboost/configuration-rules.make,$(dcf_root))
-
-libboost_installed :=
-
-$(call -include,$(dcf_root)/import/libboost/configuration-dynamic.make)
-
-ifdef libboost_installed
-
-ifeq ($(libboost_installed),y)
-
-ifeq ($(libboost_system),y)
-$(call export,l: -lboost_filesystem$(libboost_suffix) -lboost_system$(libboost_suffix),cpp_options: )
-else
-$(call export,l: -lboost_filesystem$(libboost_suffix),cpp_options: )
-endif
-
-else
-
-$(call include-once,$(scf_root)/import/libboost/filesystem/rules.make,$(dcf_root))
-
-$(call export,\
- l: $(dcf_root)/import/libboost/filesystem/filesystem.l,\
- cpp-options: $(dcf_root)/import/libboost/filesystem/filesystem.l.cpp-options)
-
-endif
-
-else
-
-.NOTPARALLEL:
-
-endif
diff --git a/build/import/libboost/version b/build/import/libboost/version
deleted file mode 100644
index faef31a..0000000
--- a/build/import/libboost/version
+++ /dev/null
@@ -1 +0,0 @@
-0.7.0
diff --git a/build/import/libxsd-frontend/stub.make b/build/import/libxsd-frontend/stub.make
index 15a999f..d0d75e6 100644
--- a/build/import/libxsd-frontend/stub.make
+++ b/build/import/libxsd-frontend/stub.make
@@ -13,7 +13,7 @@ ifdef libxsd_frontend_installed
ifeq ($(libxsd_frontend_installed),y)
-$(call export,l: -lxsd-frontend -lfrontend-elements -lcult -lboost_filesystem -lxerces-c,cpp_options: )
+$(call export,l: -lxsd-frontend -lfrontend-elements -lcult -lxerces-c,cpp_options: )
else
diff --git a/tests/dump/driver.cxx b/tests/dump/driver.cxx
index f17579f..766aaa4 100644
--- a/tests/dump/driver.cxx
+++ b/tests/dump/driver.cxx
@@ -578,7 +578,7 @@ main (int argc, char* argv[])
// Parse schema.
//
- SemanticGraph::Path path (argv[i], boost::filesystem::native);
+ SemanticGraph::Path path (argv[i]);
Parser parser (true, false, true);
auto_ptr<SemanticGraph::Schema> tu (parser.parse (path));
diff --git a/xsd-frontend/makefile b/xsd-frontend/makefile
index 51ce8f2..3f62bf0 100644
--- a/xsd-frontend/makefile
+++ b/xsd-frontend/makefile
@@ -59,12 +59,6 @@ xsd_frontend.l.cpp-options := $(out_base)/xsd-frontend.l.cpp-options
clean := $(out_base)/.clean
-# Import.
-#
-$(call import,\
- $(scf_root)/import/libboost/filesystem/stub.make,\
- l: fs.l,cpp-options: fs.l.cpp-options)
-
$(call import,\
$(scf_root)/import/libxerces-c/stub.make,\
l: xerces_c.l,cpp-options: xerces_c.l.cpp-options)
@@ -75,13 +69,11 @@ $(call import,\
# What to build.
#
-$(xsd_frontend.l): $(cxx_obj) $(cutl.l) $(xerces_c.l) $(fs.l)
+$(xsd_frontend.l): $(cxx_obj) $(cutl.l) $(xerces_c.l)
$(xsd_frontend.l.cpp-options): prefix := xsd-frontend/ $(out_root)/
$(xsd_frontend.l.cpp-options): value := -I$(src_root) -I$(out_root)
-$(xsd_frontend.l.cpp-options): \
- $(fs.l.cpp-options) \
- $(cutl.l.cpp-options)
+$(xsd_frontend.l.cpp-options): $(cutl.l.cpp-options)
#@@ This can be further optimized since only parser depends on xerces.
#
diff --git a/xsd-frontend/parser.cxx b/xsd-frontend/parser.cxx
index a9701a4..dbe070c 100644
--- a/xsd-frontend/parser.cxx
+++ b/xsd-frontend/parser.cxx
@@ -1303,18 +1303,6 @@ namespace XSDFrontend
};
}
- //
- //
- struct FilePathComparator
- {
- bool
- operator () (SemanticGraph::Path const& x,
- SemanticGraph::Path const& y) const
- {
- return x.native_file_string () < y.native_file_string ();
- }
- };
-
// Parser::Impl
//
@@ -1669,9 +1657,7 @@ namespace XSDFrontend
friend bool
operator< (SchemaId const& x, SchemaId const& y)
{
- return x.path_.native_file_string () < y.path_.native_file_string ()
- || (x.path_.native_file_string () == y.path_.native_file_string ()
- && x.ns_ < y.ns_);
+ return x.path_ < y.path_ || (x.path_ == y.path_ && x.ns_ < y.ns_);
}
private:
@@ -1923,10 +1909,12 @@ namespace XSDFrontend
// Parse.
//
{
- // Enter the file into schema_map_.
+ // Enter the file into schema_map_. Do normalize() before
+ // complete() to avoid hitting system path limits with '..'
+ // directories.
//
- Path abs_path (system_complete (tu));
- abs_path.normalize ();
+ Path abs_path (tu);
+ abs_path.normalize ().complete ();
schema_map_[SchemaId (abs_path, ns)] = rs.get ();
rs->context ().set ("absolute-path", abs_path);
@@ -2126,7 +2114,7 @@ namespace XSDFrontend
NamespaceMap cache;
cache_ = &cache;
- auto_ptr<Schema> rs (new Schema ("", 0, 0));
+ auto_ptr<Schema> rs (new Schema (Path (), 0, 0));
// Implied schema with fundamental types.
//
@@ -2153,10 +2141,12 @@ namespace XSDFrontend
if (trace_)
wcout << "target namespace: " << ns << endl;
- // Check if we already have this schema.
+ // Check if we already have this schema. Do normalize() before
+ // complete() to avoid hitting system path limits with '..'
+ // directories.
//
- Path abs_path (system_complete (tu));
- abs_path.normalize ();
+ Path abs_path (tu);
+ abs_path.normalize ().complete ();
SchemaId schema_id (abs_path, ns);
if (schema_map_.find (schema_id) != schema_map_.end ())
@@ -2434,31 +2424,21 @@ namespace XSDFrontend
Path path, rel_path, abs_path;
try
{
- try
- {
- path = Path (loc);
- }
- catch (InvalidPath const&)
- {
- // Retry as a native path.
- //
- path = Path (loc, boost::filesystem::native);
- }
+ path = Path (loc);
- if (path.is_complete ())
+ if (path.absolute ())
{
abs_path = rel_path = path;
+ abs_path.normalize ();
}
else
{
- // Use abs_file to construct the absolute path to avoid
- // hitting system path limits with '..' directories.
+ // Do normalize() before complete() to avoid hitting system path
+ // limits with '..' directories.
//
- rel_path = file ().branch_path () / path;
- abs_path = system_complete (abs_file ().branch_path () / path);
+ abs_path = rel_path = file ().directory () / path;
+ abs_path.normalize ().complete ();
}
-
- abs_path.normalize ();
}
catch (InvalidPath const&)
{
@@ -2541,31 +2521,21 @@ namespace XSDFrontend
Path path, rel_path, abs_path;
try
{
- try
- {
- path = Path (loc);
- }
- catch (InvalidPath const&)
- {
- // Retry as a native path.
- //
- path = Path (loc, boost::filesystem::native);
- }
+ path = Path (loc);
- if (path.is_complete ())
+ if (path.absolute ())
{
abs_path = rel_path = path;
+ abs_path.normalize ();
}
else
{
- // Use abs_file to construct the absolute path to avoid
- // hitting system path limits with '..' directories.
+ // Do normalize() before complete() to avoid hitting system path
+ // limits with '..' directories.
//
- rel_path = file ().branch_path () / path;
- abs_path = system_complete (abs_file ().branch_path () / path);
+ abs_path = rel_path = file ().directory () / path;
+ abs_path.normalize ().complete ();
}
-
- abs_path.normalize ();
}
catch (InvalidPath const&)
{
@@ -4791,7 +4761,7 @@ namespace XSDFrontend
Context& operator= (Context const&);
private:
- typedef std::map<Path, Path, FilePathComparator> FileMap;
+ typedef std::map<Path, Path> FileMap;
FileMap file_map_;
};
@@ -4819,8 +4789,7 @@ namespace XSDFrontend
XSDFrontend::SemanticGraph::Path abs_path (
- XML::transcode_to_narrow (e.getLocation ()->getURI ()),
- boost::filesystem::native);
+ XML::transcode_to_narrow (e.getLocation ()->getURI ()));
XSDFrontend::SemanticGraph::Path rel_path (ctx_.file (abs_path));
@@ -4873,8 +4842,7 @@ namespace XSDFrontend
base_ (base),
ctx_ (ctx)
{
- setSystemId (XML::XMLChString (
- String (abs_.native_file_string ())).c_str ());
+ setSystemId (XML::XMLChString (String (abs_.string ())).c_str ());
}
virtual Xerces::BinInputStream*
@@ -4947,8 +4915,7 @@ namespace XSDFrontend
// base_uri should be a valid path by now.
//
- Path base (XML::transcode_to_narrow (base_uri),
- boost::filesystem::native);
+ Path base (XML::transcode_to_narrow (base_uri));
if (prv_id == 0)
{
@@ -4972,31 +4939,19 @@ namespace XSDFrontend
try
{
- Path path;
-
- try
- {
- path = Path (path_str);
- }
- catch (InvalidPath const&)
- {
- // Retry as a native path.
- //
- path = Path (path_str, boost::filesystem::native);
- }
-
- Path base_dir (base.branch_path ());
+ Path path (path_str);
+ Path base_dir (base.directory ());
Path abs_path, rel_path;
- if (path.is_complete ())
+ if (path.absolute ())
{
abs_path = rel_path = path;
}
else
{
abs_path = base_dir / path;
- rel_path = ctx_.file (base).branch_path () / path;
+ rel_path = ctx_.file (base).directory () / path;
}
abs_path.normalize ();
@@ -5042,8 +4997,11 @@ namespace XSDFrontend
{
XSDFrontend::Context ctx;
- Path abs_path (system_complete (tu));
- abs_path.normalize ();
+ // Do normalize() before complete() to avoid hitting system path
+ // limits with '..' directories.
+ //
+ Path abs_path (tu);
+ abs_path.normalize ().complete ();
ctx.map_file (abs_path, tu);
InputSource input_source (abs_path, tu, abs_path, ctx);
diff --git a/xsd-frontend/semantic-graph/elements.cxx b/xsd-frontend/semantic-graph/elements.cxx
index 28cfe4d..d99bb37 100644
--- a/xsd-frontend/semantic-graph/elements.cxx
+++ b/xsd-frontend/semantic-graph/elements.cxx
@@ -296,5 +296,5 @@ namespace XSDFrontend
std::wostream&
operator<< (std::wostream& os, XSDFrontend::SemanticGraph::Path const& path)
{
- return os << path.native_file_string ().c_str ();
+ return os << path.string ().c_str ();
}
diff --git a/xsd-frontend/semantic-graph/elements.hxx b/xsd-frontend/semantic-graph/elements.hxx
index 1847572..b4904d6 100644
--- a/xsd-frontend/semantic-graph/elements.hxx
+++ b/xsd-frontend/semantic-graph/elements.hxx
@@ -10,16 +10,15 @@
#include <map>
#include <list>
#include <vector>
-#include <utility> // std::pair
#include <iosfwd>
-
-#include <boost/filesystem/path.hpp>
-#include <boost/filesystem/operations.hpp>
-#include <boost/filesystem/exception.hpp>
+#include <utility> // std::pair
+#include <cstdlib> // abort
+#include <cassert>
#include <cutl/container/graph.hxx>
#include <cutl/container/pointer-iterator.hxx>
#include <cutl/compiler/context.hxx>
+#include <cutl/fs/path.hxx>
#include <xsd-frontend/types.hxx>
@@ -33,9 +32,9 @@ namespace XSDFrontend
//
//
- typedef boost::filesystem::path Path;
+ typedef fs::path Path;
+ typedef fs::invalid_path InvalidPath;
typedef std::vector<Path> Paths;
- typedef boost::filesystem::filesystem_error InvalidPath;
typedef compiler::context Context;
diff --git a/xsd-frontend/transformations/anonymous.cxx b/xsd-frontend/transformations/anonymous.cxx
index 3fa4f00..2c5b009 100644
--- a/xsd-frontend/transformations/anonymous.cxx
+++ b/xsd-frontend/transformations/anonymous.cxx
@@ -531,6 +531,7 @@ namespace XSDFrontend
// Run the name through the translation service.
//
SemanticGraph::Path file (path (l));
+ file.normalize ();
String file_str;
// Try to use the portable representation of the path. If that
@@ -538,11 +539,11 @@ namespace XSDFrontend
//
try
{
- file_str = file.string ();
+ file_str = file.posix_string ();
}
catch (SemanticGraph::InvalidPath const&)
{
- file_str = file.native_file_string ();
+ file_str = file.string ();
}
String name (
@@ -615,17 +616,18 @@ namespace XSDFrontend
if (!file_str)
{
SemanticGraph::Path file (path (u));
+ file.normalize ();
// Try to use the portable representation of the path. If
// that fails, fall back to the native representation.
//
try
{
- file_str = file.string ();
+ file_str = file.posix_string ();
}
catch (SemanticGraph::InvalidPath const&)
{
- file_str = file.native_file_string ();
+ file_str = file.string ();
}
}
@@ -697,6 +699,7 @@ namespace XSDFrontend
// Run the name through the translation service.
//
SemanticGraph::Path file (path (c));
+ file.normalize ();
String file_str;
// Try to use the portable representation of the path. If that
@@ -704,11 +707,11 @@ namespace XSDFrontend
//
try
{
- file_str = file.string ();
+ file_str = file.posix_string ();
}
catch (SemanticGraph::InvalidPath const&)
{
- file_str = file.native_file_string ();
+ file_str = file.string ();
}
String name (
@@ -895,6 +898,7 @@ namespace XSDFrontend
// Run the name through the translation service.
//
SemanticGraph::Path file (path (m));
+ file.normalize ();
String file_str;
// Try to use the portable representation of the path. If that
@@ -902,11 +906,11 @@ namespace XSDFrontend
//
try
{
- file_str = file.string ();
+ file_str = file.posix_string ();
}
catch (SemanticGraph::InvalidPath const&)
{
- file_str = file.native_file_string ();
+ file_str = file.string ();
}
String name (
diff --git a/xsd-frontend/transformations/schema-per-type.cxx b/xsd-frontend/transformations/schema-per-type.cxx
index caae52d..b957a58 100644
--- a/xsd-frontend/transformations/schema-per-type.cxx
+++ b/xsd-frontend/transformations/schema-per-type.cxx
@@ -374,6 +374,8 @@ namespace XSDFrontend
for (Schemas::iterator i (schemas.begin ()); i != schemas.end (); ++i)
{
+ // This path was already normalized by the parser.
+ //
SemanticGraph::Path const& path (
(*i)->context ().get<SemanticGraph::Path> ("absolute-path"));
@@ -386,15 +388,15 @@ namespace XSDFrontend
//
try
{
- abs_path = path.string ();
+ abs_path = path.posix_string ();
}
catch (SemanticGraph::InvalidPath const&)
{
- abs_path = path.native_file_string ();
+ abs_path = path.string ();
}
NarrowString tf (trans_.translate_schema (abs_path));
- NarrowString file (tf ? tf : path.leaf ());
+ NarrowString file (tf ? tf : path.leaf ().string ());
size_t p (file.rfind ('.'));
NarrowString ext (