Source

vimclojure-experimental / installers / windows.diff

Diff from to

installers/windows.diff

 Added Windows installer by Justin Johnson
 
-diff --git a/installers/LICENSE.txt b/installers/LICENSE.txt
+diff --git a/installers/LICENSE.rtf b/installers/LICENSE.rtf
 new file mode 100644
 --- /dev/null
-+++ b/installers/LICENSE.txt
-@@ -0,0 +1,177 @@
-+ *   VimClojure Box
-+ *   Copyright (c) Justin Johnson. All rights reserved.
-+ *   The use and distribution terms for this software are covered by the
-+ *   Eclipse Public License 1.0 (http://opensource.org/licenses/eclipse-1.0.php)
-+ *   which can be found in the file epl-v10.html at the root of this distribution.
-+ *   By using this software in any fashion, you are agreeing to be bound by
-+ *    the terms of this license.
-+ *   You must not remove this notice, or any other, from this software.
++++ b/installers/LICENSE.rtf
+@@ -0,0 +1,283 @@
++{\rtf1\ansi\ansicpg1252\cocoartf949\cocoasubrtf460
++{\fonttbl\f0\fswiss\fcharset0 ArialMT;\f1\froman\fcharset0 TimesNewRomanPSMT;}
++{\colortbl;\red255\green255\blue255;}
++{\*\listtable{\list\listtemplateid1\listhybrid{\listlevel\levelnfc0\levelnfcn0\leveljc2\leveljcn2\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{decimal\}.}{\leveltext\leveltemplateid0\'02\'05.;}{\levelnumbers\'01;}}{\listname ;}\listid1}
++{\list\listtemplateid2\listhybrid{\listlevel\levelnfc0\levelnfcn0\leveljc2\leveljcn2\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{decimal\}.}{\leveltext\leveltemplateid0\'02\'05.;}{\levelnumbers\'01;}}{\listname ;}\listid2}
++{\list\listtemplateid3\listhybrid{\listlevel\levelnfc0\levelnfcn0\leveljc2\leveljcn2\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{decimal\}.}{\leveltext\leveltemplateid0\'02\'05.;}{\levelnumbers\'01;}}{\listname ;}\listid3}}
++{\*\listoverridetable{\listoverride\listid1\listoverridecount0\ls1}{\listoverride\listid2\listoverridecount0\ls2}{\listoverride\listid3\listoverridecount0\ls3}}
++{\info
++{\keywords cursorLocation=5003, fitsPagesWidth=1}}\paperw11900\paperh16840\margl1008\margr1008\margt1008\vieww15520\viewh15560\viewkind1\viewscale124
++\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\sl360\slmult1\ql\qnatural\pardirnatural
 +
-+--------------------------------------------------------------------------
-+This program uses VimClojure which is distributed with the following notice:
++\f0\b\fs40 \cf0 VimClojure Box
++\f1 \
 +
-+ * Copyright 2008,2009 (c) Meikel Brandmeyer.
-+ * 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.
-+ 
-+--------------------------------------------------------------------------
-+This program uses Clojure which is distributed with the following notice:
++\b0\fs26 \
++Copyright \'a9 Justin Johnson. All rights reserved.\
++\
++The use and distribution terms for this software are covered by the Eclipse Public License 1.0 (http://opensource.org/licenses/eclipse-1.0.php) which can be found in the file LICENSE.rtf in the installers subdirectory of this distribution.\
++\
++By using this software in any fashion, you are agreeing to be bound by the terms of this license.\
++\
++You must not remove this notice, or any other, from this software.\
++\
++\
++\
++\
++\
++\
++\
++\
++\
++\
++\
++\
++\
++\
++\
++\
++\
 +
-+ *   Clojure
-+ *   Copyright (c) Rich Hickey. All rights reserved.
-+ *   The use and distribution terms for this software are covered by the
-+ *   Eclipse Public License 1.0 (http://opensource.org/licenses/eclipse-1.0.php)
-+ *   which can be found in the file epl-v10.html at the root of this distribution.
-+ *   By using this software in any fashion, you are agreeing to be bound by
-+ *    the terms of this license.
-+ *   You must not remove this notice, or any other, from this software.
-+ 
-+--------------------------------------------------------------------------
-+Clojure uses the ASM bytecode engineering library which is distributed
-+with the following notice:
-+ 
-+ * Copyright (c) 2000-2005 INRIA, France Telecom
-+ * All rights reserved.
-+ *  
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ *  
-+ * 1. Redistributions of source code must retain the above copyright
-+ *    notice, this list of conditions and the following disclaimer.
-+ *  
-+ * 2. Redistributions in binary form must reproduce the above copyright
-+ *    notice, this list of conditions and the following disclaimer in the
-+ *    documentation and/or other materials provided with the distribution.
-+ *  
-+ * 3. Neither the name of the copyright holders nor the names of its
-+ *    contributors may be used to endorse or promote products derived from
-+ *    this software without specific prior written permission.
-+ *  
-+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
-+ * THE POSSIBILITY OF SUCH DAMAGE.
++\f0\b\fs40 VimClojure
++\f1\b0\fs26 \
++\
++This program uses VimClojure which is distributed under the MIT license.\
++\
++ Copyright 2008,2009 \'a9 Meikel Brandmeyer.\
++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.\
++\
 +
-+--------------------------------------------------------------------------
-+This program uses clojure-contrib which is distributed with the following notice:
++\b 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.
++\b0 \
++ \
++\
++\
++\
++\
 +
-+Common Public License Version 1.0
-+ 
-+THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS COMMON PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
-+ 
-+ 
-+1. DEFINITIONS 
-+ 
-+"Contribution" means:
-+ 
-+a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and 
-+ 
-+b) in the case of each subsequent Contributor:
-+ 
-+i) changes to the Program, and
-+ 
-+ii) additions to the Program;
-+ 
-+where such changes and/or additions to the Program originate from and are distributed by that particular Contributor. A Contribution 'originates' from a Contributor if it was added to the Program by such Contributor itself or anyone acting on such Contributor's behalf. Contributions do not include additions to the Program which: (i) are separate modules of software distributed in conjunction with the Program under their own license agreement, and (ii) are not derivative works of the Program.
-+ 
-+"Contributor" means any person or entity that distributes the Program. 
-+ 
-+"Licensed Patents " mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale of its Contribution alone or when combined with the Program.
-+ 
-+"Program" means the Contributions distributed in accordance with this Agreement. 
-+ 
-+"Recipient" means anyone who receives the Program under this Agreement, including all Contributors. 
-+ 
-+ 
-+2. GRANT OF RIGHTS
-+ 
-+a) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, distribute and sublicense the Contribution of such Contributor, if any, and such derivative works, in source code and object code form.
-+ 
-+b) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer the Contribution of such Contributor, if any, in source code and object code form. This patent license shall apply to the combination of the Contribution and the Program if, at the time the Contribution is added by the Contributor, such addition of the Contribution causes such combination to be covered by the Licensed Patents. The patent license shall not apply to any other combinations which include the Contribution. No hardware per se is licensed hereunder.
-+ 
-+c) Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property rights of any other entity. Each Contributor disclaims any liability to Recipient for claims brought by any other entity based on infringement of intellectual property rights or otherwise. As a condition to exercising the rights and licenses granted hereunder, each Recipient hereby assumes sole responsibility to secure any other intellectual property rights needed, if any. For example, if a third party patent license is required to allow Recipient to distribute the Program, it is Recipient's responsibility to acquire that license before distributing the Program.
-+ 
-+d) Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to grant the copyright license set forth in this Agreement.
-+ 
-+ 
-+3. REQUIREMENTS 
-+ 
-+A Contributor may choose to distribute the Program in object code form under its own license agreement, provided that: 
-+ 
-+a) it complies with the terms and conditions of this Agreement; and
-+ 
-+b) its license agreement:
-+ 
-+i) effectively disclaims on behalf of all Contributors all warranties and conditions, express and implied, including warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and fitness for a particular purpose; 
-+ 
-+ii) effectively excludes on behalf of all Contributors all liability for damages, including direct, indirect, special, incidental and consequential damages, such as lost profits; 
-+ 
-+iii) states that any provisions which differ from this Agreement are offered by that Contributor alone and not by any other party; and 
-+ 
-+iv) states that source code for the Program is available from such Contributor, and informs licensees how to obtain it in a reasonable manner on or through a medium customarily used for software exchange. 
-+ 
-+When the Program is made available in source code form:
-+ 
-+a) it must be made available under this Agreement; and
-+ 
-+b) a copy of this Agreement must be included with each copy of the Program. 
-+ 
-+Contributors may not remove or alter any copyright notices contained within the Program.
-+ 
-+Each Contributor must identify itself as the originator of its Contribution, if any, in a manner that reasonably allows subsequent Recipients to identify the originator of the Contribution. 
-+ 
-+ 
-+4. COMMERCIAL DISTRIBUTION 
-+ 
-+Commercial distributors of software may accept certain responsibilities with respect to end users, business partners and the like. While this license is intended to facilitate the commercial use of the Program, the Contributor who includes the Program in a commercial product offering should do so in a manner which does not create potential liability for other Contributors. Therefore, if a Contributor includes the Program in a commercial product offering, such Contributor ("Commercial Contributor") hereby agrees to defend and indemnify every other Contributor ("Indemnified Contributor") against any losses, damages and costs (collectively "Losses") arising from claims, lawsuits and other legal actions brought by a third party against the Indemnified Contributor to the extent caused by the acts or omissions of such Commercial Contributor in connection with its distribution of the Program in a commercial product offering. The obligations in this section do not apply to any claims or Losses relating to any actual or alleged intellectual property infringement. In order to qualify, an Indemnified Contributor must: a) promptly notify the Commercial Contributor in writing of such claim, and b) allow the Commercial Contributor to control, and cooperate with the Commercial Contributor in, the defense and any related settlement negotiations. The Indemnified Contributor may participate in any such claim at its own expense. 
-+ 
-+For example, a Contributor might include the Program in a commercial product offering, Product X. That Contributor is then a Commercial Contributor. If that Commercial Contributor then makes performance claims, or offers warranties related to Product X, those performance claims and warranties are such Commercial Contributor's responsibility alone. Under this section, the Commercial Contributor would have to defend claims against the other Contributors related to those performance claims and warranties, and if a court requires any other Contributor to pay any damages as a result, the Commercial Contributor must pay those damages. 
-+ 
-+ 
-+5. NO WARRANTY
-+ 
-+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely responsible for determining the appropriateness of using and distributing the Program and assumes all risks associated with its exercise of rights under this Agreement, including but not limited to the risks and costs of program errors, compliance with applicable laws, damage to or loss of data, programs or equipment, and unavailability or interruption of operations. 
-+ 
-+ 
-+6. DISCLAIMER OF LIABILITY 
-+ 
-+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. 
-+ 
-+ 
-+7. GENERAL
-+ 
-+If any provision of this Agreement is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this Agreement, and without further action by the parties hereto, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable. 
-+ 
-+If Recipient institutes patent litigation against a Contributor with respect to a patent applicable to software (including a cross-claim or counterclaim in a lawsuit), then any patent licenses granted by that Contributor to such Recipient under this Agreement shall terminate as of the date such litigation is filed. In addition, if Recipient institutes patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Program itself (excluding combinations of the Program with other software or hardware) infringes such Recipient's patent(s), then such Recipient's rights granted under Section 2(b) shall terminate as of the date such litigation is filed.
-+ 
-+All Recipient's rights under this Agreement shall terminate if it fails to comply with any of the material terms or conditions of this Agreement and does not cure such failure in a reasonable period of time after becoming aware of such noncompliance. If all Recipient's rights under this Agreement terminate, Recipient agrees to cease use and distribution of the Program as soon as reasonably practicable. However, Recipient's obligations under this Agreement and any licenses granted by Recipient relating to the Program shall continue and survive. 
-+ 
-+Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the Agreement is copyrighted and may only be modified in the following manner. The Agreement Steward reserves the right to publish new versions (including revisions) of this Agreement from time to time. No one other than the Agreement Steward has the right to modify this Agreement. IBM is the initial Agreement Steward. IBM may assign the responsibility to serve as the Agreement Steward to a suitable separate entity. Each new version of the Agreement will be given a distinguishing version number. The Program (including Contributions) may always be distributed subject to the version of the Agreement under which it was received. In addition, after a new version of the Agreement is published, Contributor may elect to distribute the Program (including its Contributions) under the new version. Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to the intellectual property of any Contributor under this Agreement, whether expressly, by implication, estoppel or otherwise. All rights in the Program not expressly granted under this Agreement are reserved. 
-+ 
-+This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation.
-+ 
-diff --git a/installers/epl-v10.html b/installers/epl-v10.html
++\f0\b\fs40 Clojure
++\f1 \
++
++\b0\fs26 \
++This program uses Clojure which is distributed with the following notice:\
++\
++Copyright \'a9 Rich Hickey. All rights reserved.\
++\
++The use and distribution terms for this software are covered by the Eclipse Public License 1.0 (http://opensource.org/licenses/eclipse-1.0.php) which can be found in the LICENSE.rtf file in the installers subdirectory of this distribution.\
++\
++By using this software in any fashion, you are agreeing to be bound by the terms of this license.\
++\
++You must not remove this notice, or any other, from this software.\
++ \
++\
++\
++\
++\
++\
++\
++\
++\
++\
++\
++\
++\
++\
++\
++
++\f0\b\fs40 ASM Bytecode Engineering Library\
++
++\f1\b0\fs26 \
++Copyright \'a9 2000-2005 INRIA, France Telecom.\
++All rights reserved.\
++ \
++Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:\
++\pard\tx85\tx283\li289\fi-290\sl360\slmult1\ql\qnatural\pardirnatural
++\ls1\ilvl0\cf0 {\listtext	1.	}Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.\
++{\listtext	2.	}Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.\
++{\listtext	3.	}Neither the name of the copyright holders nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.\
++\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\sl360\slmult1\ql\qnatural\pardirnatural
++\cf0   \
++
++\b THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
++\b0 \
++\
++
++\f0\b\fs40 Clojure-Contrib
++\f1\b0\fs26 \
++\
++This program uses clojure-contrib which is distributed with the following notice:\
++\
++Copyright \'a9 Rich Hickey et al. All rights reserved.\
++\
++The use and distribution terms for this software are covered by the Eclipse Public License 1.0 (http://opensource.org/licenses/eclipse-1.0.php) which can be found in the LICENSE.rtf file in the installers subdirectory of this distribution.\
++\
++By using this software in any fashion, you are agreeing to be bound by the terms of this license.\
++\
++You must not remove this notice, or any other, from this software.\
++\
++\
++\
++\
++\
++\
++\
++\
++\
++\
++\
++\
++\
++\
++\
++\
++
++\f0\b\fs40 Eclipse Public License - v 1.0
++\f1\b0\fs26 \
++\
++The Eclipse Public License in effect for 
++\i Clojure
++\i0  and 
++\i Clojure-Contrib
++\i0 .\
++\
++
++\b THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR\
++DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.\
++
++\b0 \
++
++\f0\b\fs32 1. DEFINITIONS
++\f1\b0\fs26 \
++\
++
++\i Contribution
++\i0  means:\
++\
++\pard\tx85\tx283\li289\fi-290\sl360\slmult1\ql\qnatural\pardirnatural
++\ls2\ilvl0\cf0 {\listtext	1.	}in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and\
++\pard\tx85\tx283\sl360\slmult1\ql\qnatural\pardirnatural
++\ls2\ilvl0\cf0 {\listtext	2.	}in the case of each subsequent Contributor:\
++\pard\tx220\tx720\tx1120\li720\fi-720\sl360\slmult1\ql\qnatural\pardirnatural
++\ls3\ilvl0\cf0 {\listtext	1.	}changes to the Program, and\
++{\listtext	2.	}additions to the Program;\
++\
++\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\sl360\slmult1\ql\qnatural\pardirnatural
++\cf0 where such changes and/or additions to the Program originate from and are distributed by that particular Contributor. A Contribution 
++\i originates
++\i0  from a Contributor if it was added to the\
++Program by such Contributor itself or anyone acting on such Contributor's behalf. Contributions do not include additions to the Program which: (i) are separate modules of software distributed in conjunction with the Program under their own license agreement, and (ii) are not derivative works of the Program.\
++\
++
++\i Contributor
++\i0  means any person or entity that distributes the Program.\
++\
++
++\i Licensed Patents 
++\i0 mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale of its Contribution alone or when combined with the Program.\
++
++\i Program
++\i0  means the Contributions distributed in accordance with this Agreement.\
++\
++
++\i Recipient
++\i0  means anyone who receives the Program under this Agreement, including all Contributors.\
++\
++
++\f0\b\fs32 2. GRANT OF RIGHTS
++\f1\b0\fs26 \
++\
++a) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free copyright license to reproduce, prepare derivative works\
++of, publicly display, publicly perform, distribute and sublicense the Contribution of such Contributor, if any, and such derivative works, in source code and object code form.\
++\
++b) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed Patents to make, use, sell,\
++offer to sell, import and otherwise transfer the Contribution of such Contributor, if any, in source code and object code form. This patent license shall apply to the combination of the Contribution and the Program if, at the time the Contribution is added by the Contributor,\
++such addition of the Contribution causes such combination to be covered by the Licensed Patents. The patent license shall not apply to any other combinations which include the Contribution. No hardware per se is licensed hereunder.\
++\
++c) Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property rights of any other entity. Each Contributor disclaims any liability to Recipient for claims brought by any other entity based on infringement of intellectual property rights or otherwise. As a condition to exercising the rights and licenses granted hereunder, each Recipient hereby assumes sole responsibility to secure any other intellectual property rights needed, if any. For example, if a third party patent license is required to allow Recipient to distribute the Program, it is Recipient's responsibility to acquire that license before distributing the Program.\
++d) Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to grant the copyright license set forth in this Agreement.\
++\
++
++\f0\b\fs32 3. REQUIREMENTS
++\f1\b0\fs26 \
++\
++A Contributor may choose to distribute the Program in object code form under its own license agreement, provided that:\
++a) it complies with the terms and conditions of this Agreement; and\
++b) its license agreement:\
++\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li773\fi-774\sl360\slmult1\ql\qnatural\pardirnatural
++\cf0 	i) effectively disclaims on behalf of all Contributors all warranties and conditions, express and implied, including warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and fitness for a particular purpose;\
++	ii) effectively excludes on behalf of all Contributors all liability for damages, including direct, indirect, special, incidental and consequential damages, such as lost profits;\
++	iii) states that any provisions which differ from this Agreement are offered by that Contributor alone and not by any other party; and\
++	iv) states that source code for the Program is available from such Contributor, and informs licensees how to obtain it in a reasonable manner on or through a medium customarily used for software exchange.\
++\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\sl360\slmult1\ql\qnatural\pardirnatural
++\cf0 \
++When the Program is made available in source code form:\
++a) it must be made available under this Agreement; and\
++b) a copy of this Agreement must be included with each copy of the Program.\
++\
++Contributors may not remove or alter any copyright notices contained within the Program.\
++\
++Each Contributor must identify itself as the originator of its Contribution, if any, in a manner that reasonably allows subsequent Recipients to identify the originator of the Contribution.\
++\
++
++\f0\b\fs32 4. COMMERCIAL DISTRIBUTION
++\f1\b0\fs26 \
++\
++Commercial distributors of software may accept certain responsibilities with respect to end users, business partners and the like. While this license is intended to facilitate the commercial use of the Program, the Contributor who includes the Program in a commercial product offering should do so in a manner which does not create potential liability for other Contributors. Therefore, if a Contributor includes the Program in a commercial product offering, such Contributor (
++\i Commercial Contributor
++\i0 ) hereby agrees to defend and\
++indemnify every other Contributor (
++\i Indemnified Contributor
++\i0 ) against any losses, damages and costs (collectively 
++\i Losses
++\i0 ) arising from claims, lawsuits and other legal actions brought by a third party against the Indemnified Contributor to the extent caused by the acts or omissions of such Commercial Contributor in connection with its distribution of the Program in a commercial product offering. The obligations in this section do not apply to any claims or Losses relating to any actual or alleged intellectual property infringement. In order to qualify, an Indemnified Contributor must: a) promptly notify the Commercial Contributor in writing of such claim, and b) allow the Commercial Contributor to control, and cooperate with the Commercial Contributor in, the defense and any related settlement negotiations. The Indemnified Contributor may participate in any such claim at its own expense.\
++\
++For example, a Contributor might include the Program in a commercial product offering, Product X. That Contributor is then a Commercial Contributor. If that Commercial Contributor then makes performance claims, or offers warranties related to Product X, those performance\
++claims and warranties are such Commercial Contributor's responsibility alone. Under this section, the Commercial Contributor would have to defend claims against the other Contributors related to those performance claims and warranties, and if a court requires any other Contributor to pay any damages as a result, the Commercial Contributor must pay those damages.\
++\
++\
++\
++
++\f0\b\fs32 5. NO WARRANTY
++\f1\b0\fs26 \
++\
++
++\b EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
++\b0 \
++\
++Each Recipient is solely responsible for determining the appropriateness of using and distributing the Program and assumes all risks associated with its exercise of rights under this Agreement , including but not limited to the risks and costs of program errors, compliance with applicable laws, damage to or loss of data, programs or equipment, and unavailability or\
++interruption of operations.\
++\
++
++\f0\b\fs32 6. DISCLAIMER OF LIABILITY
++\f1\b0\fs26 \
++\
++
++\b EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
++\b0 \
++\
++\
++\
++
++\f0\b\fs32 7. GENERAL
++\f1\b0\fs26 \
++\
++If any provision of this Agreement is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this Agreement, and without further action by the parties hereto, such provision shall be reformed to the minimum\
++extent necessary to make such provision valid and enforceable.\
++\
++If Recipient institutes patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Program itself (excluding combinations of the Program with other software or hardware) infringes such Recipient's patent(s), then such\
++Recipient's rights granted under Section 2(b) shall terminate as of the date such litigation is filed.\
++\
++All Recipient's rights under this Agreement shall terminate if it fails to comply with any of the material terms or conditions of this Agreement and does not cure such failure in a reasonable period of time after becoming aware of such noncompliance. If all Recipient's rights under this Agreement terminate, Recipient agrees to cease use and distribution of the Program as soon as reasonably practicable. However, Recipient's obligations under this Agreement and any licenses granted by Recipient relating to the Program shall continue and survive.\
++\
++Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the Agreement is copyrighted and may only be modified in the following manner. The Agreement Steward reserves the right to publish new versions (including\
++revisions) of this Agreement from time to time. No one other than the Agreement Steward has the right to modify this Agreement. The Eclipse Foundation is the initial Agreement Steward. The Eclipse Foundation may assign the responsibility to serve as the Agreement Steward to a\
++suitable separate entity. Each new version of the Agreement will be given a distinguishing version number. The Program (including Contributions) may always be distributed subject to the version of the Agreement under which it was received. In addition, after a new version\
++of the Agreement is published, Contributor may elect to distribute the Program (including its Contributions) under the new version. Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to the intellectual property of any Contributor under this Agreement, whether expressly, by implication, estoppel or otherwise. All rights in the Program not expressly granted under this Agreement are reserved.\
++\
++This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its\
++rights to a jury trial in any resulting litigation.\
++}
+\ No newline at end of file
+diff --git a/installers/windows/EnvVarUpdate.nsh b/installers/windows/EnvVarUpdate.nsh
 new file mode 100644
 --- /dev/null
-+++ b/installers/epl-v10.html
-@@ -0,0 +1,261 @@
-+<?xml version="1.0" encoding="ISO-8859-1" ?>
-+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-+<html xmlns="http://www.w3.org/1999/xhtml">
-+
-+<head>
-+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-+<title>Eclipse Public License - Version 1.0</title>
-+<style type="text/css">
-+  body {
-+    size: 8.5in 11.0in;
-+    margin: 0.25in 0.5in 0.25in 0.5in;
-+    tab-interval: 0.5in;
-+    }
-+  p {  	
-+    margin-left: auto;
-+    margin-top:  0.5em;
-+    margin-bottom: 0.5em;
-+    }
-+  p.list {
-+  	margin-left: 0.5in;
-+    margin-top:  0.05em;
-+    margin-bottom: 0.05em;
-+    }
-+  </style>
-+
-+</head>
-+
-+<body lang="EN-US">
-+
-+<p align=center><b>Eclipse Public License - v 1.0</b></p>
-+
-+<p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
-+PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE, REPRODUCTION OR
-+DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS
-+AGREEMENT.</p>
-+
-+<p><b>1. DEFINITIONS</b></p>
-+
-+<p>&quot;Contribution&quot; means:</p>
-+
-+<p class="list">a) in the case of the initial Contributor, the initial
-+code and documentation distributed under this Agreement, and</p>
-+<p class="list">b) in the case of each subsequent Contributor:</p>
-+<p class="list">i) changes to the Program, and</p>
-+<p class="list">ii) additions to the Program;</p>
-+<p class="list">where such changes and/or additions to the Program
-+originate from and are distributed by that particular Contributor. A
-+Contribution 'originates' from a Contributor if it was added to the
-+Program by such Contributor itself or anyone acting on such
-+Contributor's behalf. Contributions do not include additions to the
-+Program which: (i) are separate modules of software distributed in
-+conjunction with the Program under their own license agreement, and (ii)
-+are not derivative works of the Program.</p>
-+
-+<p>&quot;Contributor&quot; means any person or entity that distributes
-+the Program.</p>
-+
-+<p>&quot;Licensed Patents&quot; mean patent claims licensable by a
-+Contributor which are necessarily infringed by the use or sale of its
-+Contribution alone or when combined with the Program.</p>
-+
-+<p>&quot;Program&quot; means the Contributions distributed in accordance
-+with this Agreement.</p>
-+
-+<p>&quot;Recipient&quot; means anyone who receives the Program under
-+this Agreement, including all Contributors.</p>
-+
-+<p><b>2. GRANT OF RIGHTS</b></p>
-+
-+<p class="list">a) Subject to the terms of this Agreement, each
-+Contributor hereby grants Recipient a non-exclusive, worldwide,
-+royalty-free copyright license to reproduce, prepare derivative works
-+of, publicly display, publicly perform, distribute and sublicense the
-+Contribution of such Contributor, if any, and such derivative works, in
-+source code and object code form.</p>
-+
-+<p class="list">b) Subject to the terms of this Agreement, each
-+Contributor hereby grants Recipient a non-exclusive, worldwide,
-+royalty-free patent license under Licensed Patents to make, use, sell,
-+offer to sell, import and otherwise transfer the Contribution of such
-+Contributor, if any, in source code and object code form. This patent
-+license shall apply to the combination of the Contribution and the
-+Program if, at the time the Contribution is added by the Contributor,
-+such addition of the Contribution causes such combination to be covered
-+by the Licensed Patents. The patent license shall not apply to any other
-+combinations which include the Contribution. No hardware per se is
-+licensed hereunder.</p>
-+
-+<p class="list">c) Recipient understands that although each Contributor
-+grants the licenses to its Contributions set forth herein, no assurances
-+are provided by any Contributor that the Program does not infringe the
-+patent or other intellectual property rights of any other entity. Each
-+Contributor disclaims any liability to Recipient for claims brought by
-+any other entity based on infringement of intellectual property rights
-+or otherwise. As a condition to exercising the rights and licenses
-+granted hereunder, each Recipient hereby assumes sole responsibility to
-+secure any other intellectual property rights needed, if any. For
-+example, if a third party patent license is required to allow Recipient
-+to distribute the Program, it is Recipient's responsibility to acquire
-+that license before distributing the Program.</p>
-+
-+<p class="list">d) Each Contributor represents that to its knowledge it
-+has sufficient copyright rights in its Contribution, if any, to grant
-+the copyright license set forth in this Agreement.</p>
-+
-+<p><b>3. REQUIREMENTS</b></p>
-+
-+<p>A Contributor may choose to distribute the Program in object code
-+form under its own license agreement, provided that:</p>
-+
-+<p class="list">a) it complies with the terms and conditions of this
-+Agreement; and</p>
-+
-+<p class="list">b) its license agreement:</p>
-+
-+<p class="list">i) effectively disclaims on behalf of all Contributors
-+all warranties and conditions, express and implied, including warranties
-+or conditions of title and non-infringement, and implied warranties or
-+conditions of merchantability and fitness for a particular purpose;</p>
-+
-+<p class="list">ii) effectively excludes on behalf of all Contributors
-+all liability for damages, including direct, indirect, special,
-+incidental and consequential damages, such as lost profits;</p>
-+
-+<p class="list">iii) states that any provisions which differ from this
-+Agreement are offered by that Contributor alone and not by any other
-+party; and</p>
-+
-+<p class="list">iv) states that source code for the Program is available
-+from such Contributor, and informs licensees how to obtain it in a
-+reasonable manner on or through a medium customarily used for software
-+exchange.</p>
-+
-+<p>When the Program is made available in source code form:</p>
-+
-+<p class="list">a) it must be made available under this Agreement; and</p>
-+
-+<p class="list">b) a copy of this Agreement must be included with each
-+copy of the Program.</p>
-+
-+<p>Contributors may not remove or alter any copyright notices contained
-+within the Program.</p>
-+
-+<p>Each Contributor must identify itself as the originator of its
-+Contribution, if any, in a manner that reasonably allows subsequent
-+Recipients to identify the originator of the Contribution.</p>
-+
-+<p><b>4. COMMERCIAL DISTRIBUTION</b></p>
-+
-+<p>Commercial distributors of software may accept certain
-+responsibilities with respect to end users, business partners and the
-+like. While this license is intended to facilitate the commercial use of
-+the Program, the Contributor who includes the Program in a commercial
-+product offering should do so in a manner which does not create
-+potential liability for other Contributors. Therefore, if a Contributor
-+includes the Program in a commercial product offering, such Contributor
-+(&quot;Commercial Contributor&quot;) hereby agrees to defend and
-+indemnify every other Contributor (&quot;Indemnified Contributor&quot;)
-+against any losses, damages and costs (collectively &quot;Losses&quot;)
-+arising from claims, lawsuits and other legal actions brought by a third
-+party against the Indemnified Contributor to the extent caused by the
-+acts or omissions of such Commercial Contributor in connection with its
-+distribution of the Program in a commercial product offering. The
-+obligations in this section do not apply to any claims or Losses
-+relating to any actual or alleged intellectual property infringement. In
-+order to qualify, an Indemnified Contributor must: a) promptly notify
-+the Commercial Contributor in writing of such claim, and b) allow the
-+Commercial Contributor to control, and cooperate with the Commercial
-+Contributor in, the defense and any related settlement negotiations. The
-+Indemnified Contributor may participate in any such claim at its own
-+expense.</p>
-+
-+<p>For example, a Contributor might include the Program in a commercial
-+product offering, Product X. That Contributor is then a Commercial
-+Contributor. If that Commercial Contributor then makes performance
-+claims, or offers warranties related to Product X, those performance
-+claims and warranties are such Commercial Contributor's responsibility
-+alone. Under this section, the Commercial Contributor would have to
-+defend claims against the other Contributors related to those
-+performance claims and warranties, and if a court requires any other
-+Contributor to pay any damages as a result, the Commercial Contributor
-+must pay those damages.</p>
-+
-+<p><b>5. NO WARRANTY</b></p>
-+
-+<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
-+PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS
-+OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,
-+ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY
-+OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-+responsible for determining the appropriateness of using and
-+distributing the Program and assumes all risks associated with its
-+exercise of rights under this Agreement , including but not limited to
-+the risks and costs of program errors, compliance with applicable laws,
-+damage to or loss of data, programs or equipment, and unavailability or
-+interruption of operations.</p>
-+
-+<p><b>6. DISCLAIMER OF LIABILITY</b></p>
-+
-+<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT
-+NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
-+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
-+WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
-+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
-+DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
-+HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</p>
-+
-+<p><b>7. GENERAL</b></p>
-+
-+<p>If any provision of this Agreement is invalid or unenforceable under
-+applicable law, it shall not affect the validity or enforceability of
-+the remainder of the terms of this Agreement, and without further action
-+by the parties hereto, such provision shall be reformed to the minimum
-+extent necessary to make such provision valid and enforceable.</p>
-+
-+<p>If Recipient institutes patent litigation against any entity
-+(including a cross-claim or counterclaim in a lawsuit) alleging that the
-+Program itself (excluding combinations of the Program with other
-+software or hardware) infringes such Recipient's patent(s), then such
-+Recipient's rights granted under Section 2(b) shall terminate as of the
-+date such litigation is filed.</p>
-+
-+<p>All Recipient's rights under this Agreement shall terminate if it
-+fails to comply with any of the material terms or conditions of this
-+Agreement and does not cure such failure in a reasonable period of time
-+after becoming aware of such noncompliance. If all Recipient's rights
-+under this Agreement terminate, Recipient agrees to cease use and
-+distribution of the Program as soon as reasonably practicable. However,
-+Recipient's obligations under this Agreement and any licenses granted by
-+Recipient relating to the Program shall continue and survive.</p>
-+
-+<p>Everyone is permitted to copy and distribute copies of this
-+Agreement, but in order to avoid inconsistency the Agreement is
-+copyrighted and may only be modified in the following manner. The
-+Agreement Steward reserves the right to publish new versions (including
-+revisions) of this Agreement from time to time. No one other than the
-+Agreement Steward has the right to modify this Agreement. The Eclipse
-+Foundation is the initial Agreement Steward. The Eclipse Foundation may
-+assign the responsibility to serve as the Agreement Steward to a
-+suitable separate entity. Each new version of the Agreement will be
-+given a distinguishing version number. The Program (including
-+Contributions) may always be distributed subject to the version of the
-+Agreement under which it was received. In addition, after a new version
-+of the Agreement is published, Contributor may elect to distribute the
-+Program (including its Contributions) under the new version. Except as
-+expressly stated in Sections 2(a) and 2(b) above, Recipient receives no
-+rights or licenses to the intellectual property of any Contributor under
-+this Agreement, whether expressly, by implication, estoppel or
-+otherwise. All rights in the Program not expressly granted under this
-+Agreement are reserved.</p>
-+
-+<p>This Agreement is governed by the laws of the State of New York and
-+the intellectual property laws of the United States of America. No party
-+to this Agreement will bring a legal action under this Agreement more
-+than one year after the cause of action arose. Each party waives its
-+rights to a jury trial in any resulting litigation.</p>
-+
-+</body>
-+
-+</html>
++++ b/installers/windows/EnvVarUpdate.nsh
+@@ -0,0 +1,327 @@
++/**
++ *  EnvVarUpdate.nsh
++ *    : Environmental Variables: append, prepend, and remove entries
++ *
++ *     WARNING: If you use StrFunc.nsh header then include it before this file
++ *              with all required definitions. This is to avoid conflicts
++ *
++ *  Usage:
++ *    ${EnvVarUpdate} "ResultVar" "EnvVarName" "Action" "RegLoc" "PathString"
++ *
++ *  Credits:
++ *  Version 1.0 
++ *  * Cal Turney (turnec2)
++ *  * Amir Szekely (KiCHiK) and e-circ for developing the forerunners of this
++ *    function: AddToPath, un.RemoveFromPath, AddToEnvVar, un.RemoveFromEnvVar,
++ *    WriteEnvStr, and un.DeleteEnvStr
++ *  * Diego Pedroso (deguix) for StrTok
++ *  * Kevin English (kenglish_hi) for StrContains
++ *  * Hendri Adriaens (Smile2Me), Diego Pedroso (deguix), and Dan Fuhry  
++ *    (dandaman32) for StrReplace
++ *
++ *  Version 1.1 (compatibility with StrFunc.nsh)
++ *  * techtonik
++ *
++ *  http://nsis.sourceforge.net/Environmental_Variables:_append%2C_prepend%2C_and_remove_entries
++ *
++ */
++
++
++!ifndef ENVVARUPDATE_FUNCTION
++!define ENVVARUPDATE_FUNCTION
++!verbose push
++!verbose 3
++!include "LogicLib.nsh"
++!include "WinMessages.NSH"
++!include "StrFunc.nsh"
++
++; ---- Fix for conflict if StrFunc.nsh is already includes in main file -----------------------
++!macro _IncludeStrFunction StrFuncName
++  !ifndef ${StrFuncName}_INCLUDED
++    ${${StrFuncName}}
++  !endif
++  !ifndef Un${StrFuncName}_INCLUDED
++    ${Un${StrFuncName}}
++  !endif
++  !define un.${StrFuncName} "${Un${StrFuncName}}"
++!macroend
++
++!insertmacro _IncludeStrFunction StrTok
++!insertmacro _IncludeStrFunction StrStr
++!insertmacro _IncludeStrFunction StrRep
++
++; ---------------------------------- Macro Definitions ----------------------------------------
++!macro _EnvVarUpdateConstructor ResultVar EnvVarName Action Regloc PathString
++  Push "${EnvVarName}"
++  Push "${Action}"
++  Push "${RegLoc}"
++  Push "${PathString}"
++    Call EnvVarUpdate
++  Pop "${ResultVar}"
++!macroend
++!define EnvVarUpdate '!insertmacro "_EnvVarUpdateConstructor"'
++ 
++!macro _unEnvVarUpdateConstructor ResultVar EnvVarName Action Regloc PathString
++  Push "${EnvVarName}"
++  Push "${Action}"
++  Push "${RegLoc}"
++  Push "${PathString}"
++    Call un.EnvVarUpdate
++  Pop "${ResultVar}"
++!macroend
++!define un.EnvVarUpdate '!insertmacro "_unEnvVarUpdateConstructor"'
++; ---------------------------------- Macro Definitions end-------------------------------------
++ 
++;----------------------------------- EnvVarUpdate start----------------------------------------
++!define hklm_all_users     'HKLM "SYSTEM\CurrentControlSet\Control\Session Manager\Environment"'
++!define hkcu_current_user  'HKCU "Environment"'
++ 
++!macro EnvVarUpdate UN
++ 
++Function ${UN}EnvVarUpdate
++ 
++  Push $0
++  Exch 4
++  Exch $1
++  Exch 3
++  Exch $2
++  Exch 2
++  Exch $3
++  Exch
++  Exch $4
++  Push $5
++  Push $6
++  Push $7
++  Push $8
++  Push $9
++  Push $R0
++ 
++  /* After this point:
++  -------------------------
++     $0 = ResultVar     (returned)
++     $1 = EnvVarName    (input)
++     $2 = Action        (input)
++     $3 = RegLoc        (input)
++     $4 = PathString    (input)
++     $5 = Orig EnvVar   (read from registry)
++     $6 = Len of $0     (temp)
++     $7 = tempstr1      (temp)
++     $8 = Entry counter (temp)
++     $9 = tempstr2      (temp)
++     $R0 = tempChar     (temp)  */
++ 
++  ; Step 1:  Read contents of EnvVarName from RegLoc
++  ;
++  ; Check for empty EnvVarName
++  ${If} $1 == ""
++    SetErrors
++    DetailPrint "ERROR: EnvVarName is blank"
++    Goto EnvVarUpdate_Restore_Vars
++  ${EndIf}
++ 
++  ; Check for valid Action
++  ${If}    $2 != "A"
++  ${AndIf} $2 != "P"
++  ${AndIf} $2 != "R"
++    SetErrors
++    DetailPrint "ERROR: Invalid Action - must be A, P, or R"
++    Goto EnvVarUpdate_Restore_Vars
++  ${EndIf}
++ 
++  ${If} $3 == HKLM
++    ReadRegStr $5 ${hklm_all_users} $1     ; Get EnvVarName from all users into $5
++  ${ElseIf} $3 == HKCU
++    ReadRegStr $5 ${hkcu_current_user} $1  ; Read EnvVarName from current user into $5
++  ${Else}
++    SetErrors
++    DetailPrint 'ERROR: Action is [$3] but must be "HKLM" or HKCU"'
++    Goto EnvVarUpdate_Restore_Vars
++  ${EndIf}
++ 
++  ; Check for empty PathString
++  ${If} $4 == ""
++    SetErrors
++    DetailPrint "ERROR: PathString is blank"
++    Goto EnvVarUpdate_Restore_Vars
++  ${EndIf}
++ 
++  ; Make sure we've got some work to do
++  ${If} $5 == ""
++  ${AndIf} $2 == "R"
++    SetErrors
++    DetailPrint "$1 is empty - Nothing to remove"
++    Goto EnvVarUpdate_Restore_Vars
++  ${EndIf}
++ 
++  ; Step 2: Scrub EnvVar
++  ;
++  StrCpy $0 $5                             ; Copy the contents to $0
++  ; Remove spaces around semicolons (NOTE: spaces before the 1st entry or
++  ; after the last one are not removed here but instead in Step 3)
++  ${If} $0 != ""                           ; If EnvVar is not empty ...
++    ${Do}
++      ${${UN}StrStr} $7 $0 " ;"
++      ${If} $7 == ""
++        ${ExitDo}
++      ${EndIf}
++      ${${UN}StrRep} $0  $0 " ;" ";"         ; Remove '<space>;'
++    ${Loop}
++    ${Do}
++      ${${UN}StrStr} $7 $0 "; "
++      ${If} $7 == ""
++        ${ExitDo}
++      ${EndIf}
++      ${${UN}StrRep} $0  $0 "; " ";"         ; Remove ';<space>'
++    ${Loop}
++    ${Do}
++      ${${UN}StrStr} $7 $0 ";;" 
++      ${If} $7 == ""
++        ${ExitDo}
++      ${EndIf}
++      ${${UN}StrRep} $0  $0 ";;" ";"
++    ${Loop}
++ 
++    ; Remove a leading or trailing semicolon from EnvVar
++    StrCpy  $7  $0 1 0
++    ${If} $7 == ";"
++      StrCpy $0  $0 "" 1                   ; Change ';<EnvVar>' to '<EnvVar>'
++    ${EndIf}
++    StrLen $6 $0
++    IntOp $6 $6 - 1
++    StrCpy $7  $0 1 $6
++    ${If} $7 == ";"
++     StrCpy $0  $0 $6                      ; Change ';<EnvVar>' to '<EnvVar>'
++    ${EndIf}
++    ; DetailPrint "Scrubbed $1: [$0]"      ; Uncomment to debug
++  ${EndIf}
++ 
++  /* Step 3. Remove all instances of the target path/string (even if "A" or "P")
++     $6 = bool flag (1 = found and removed PathString)
++     $7 = a string (e.g. path) delimited by semicolon(s)
++     $8 = entry counter starting at 0
++     $9 = copy of $0
++     $R0 = tempChar      */
++ 
++  ${If} $5 != ""                           ; If EnvVar is not empty ...
++    StrCpy $9 $0
++    StrCpy $0 ""
++    StrCpy $8 0
++    StrCpy $6 0
++ 
++    ${Do}
++      ${${UN}StrTok} $7 $9 ";" $8 "0"      ; $7 = next entry, $8 = entry counter
++ 
++      ${If} $7 == ""                       ; If we've run out of entries,
++        ${ExitDo}                          ;    were done
++      ${EndIf}                             ;
++ 
++      ; Remove leading and trailing spaces from this entry (critical step for Action=Remove)
++      ${Do}
++        StrCpy $R0  $7 1
++        ${If} $R0 != " "
++          ${ExitDo}
++        ${EndIf}
++        StrCpy $7   $7 "" 1                ;  Remove leading space
++      ${Loop}
++      ${Do}
++        StrCpy $R0  $7 1 -1
++        ${If} $R0 != " "
++          ${ExitDo}
++        ${EndIf}
++        StrCpy $7   $7 -1                  ;  Remove trailing space
++      ${Loop}
++      ${If} $7 == $4                       ; If string matches, remove it by not appending it
++        StrCpy $6 1                        ; Set 'found' flag
++      ${ElseIf} $7 != $4                   ; If string does NOT match
++      ${AndIf}  $0 == ""                   ;    and the 1st string being added to $0,
++        StrCpy $0 $7                       ;    copy it to $0 without a prepended semicolon
++      ${ElseIf} $7 != $4                   ; If string does NOT match
++      ${AndIf}  $0 != ""                   ;    and this is NOT the 1st string to be added to $0,
++        StrCpy $0 $0;$7                    ;    append path to $0 with a prepended semicolon
++      ${EndIf}                             ;
++ 
++      IntOp $8 $8 + 1                      ; Bump counter
++    ${Loop}                                ; Check for duplicates until we run out of paths
++  ${EndIf}
++ 
++  ; Step 4:  Perform the requested Action
++  ;
++  ${If} $2 != "R"                          ; If Append or Prepend
++    ${If} $6 == 1                          ; And if we found the target
++      DetailPrint "Target is already present in $1. It will be removed and"
++    ${EndIf}
++    ${If} $0 == ""                         ; If EnvVar is (now) empty
++      StrCpy $0 $4                         ;   just copy PathString to EnvVar
++      ${If} $6 == 0                        ; If found flag is either 0
++      ${OrIf} $6 == ""                     ; or blank (if EnvVarName is empty)
++        DetailPrint "$1 was empty and has been updated with the target"
++      ${EndIf}
++    ${ElseIf} $2 == "A"                    ;  If Append (and EnvVar is not empty),
++      StrCpy $0 $0;$4                      ;     append PathString
++      ${If} $6 == 1
++        DetailPrint "appended to $1"
++      ${Else}
++        DetailPrint "Target was appended to $1"
++      ${EndIf}
++    ${Else}                                ;  If Prepend (and EnvVar is not empty),
++      StrCpy $0 $4;$0                      ;     prepend PathString
++      ${If} $6 == 1
++        DetailPrint "prepended to $1"
++      ${Else}
++        DetailPrint "Target was prepended to $1"
++      ${EndIf}
++    ${EndIf}
++  ${Else}                                  ; If Action = Remove
++    ${If} $6 == 1                          ;   and we found the target
++      DetailPrint "Target was found and removed from $1"
++    ${Else}
++      DetailPrint "Target was NOT found in $1 (nothing to remove)"
++    ${EndIf}
++    ${If} $0 == ""
++      DetailPrint "$1 is now empty"
++    ${EndIf}
++  ${EndIf}
++ 
++  ; Step 5:  Update the registry at RegLoc with the updated EnvVar and announce the change
++  ;
++  ClearErrors
++  ${If} $3  == HKLM
++    WriteRegExpandStr ${hklm_all_users} $1 $0     ; Write it in all users section
++  ${ElseIf} $3 == HKCU
++    WriteRegExpandStr ${hkcu_current_user} $1 $0  ; Write it to current user section
++  ${EndIf}
++ 
++  IfErrors 0 +4
++    MessageBox MB_OK|MB_ICONEXCLAMATION "Could not write updated $1 to $3"
++    DetailPrint "Could not write updated $1 to $3"
++    Goto EnvVarUpdate_Restore_Vars
++ 
++  ; "Export" our change
++  SendMessage ${HWND_BROADCAST} ${WM_WININICHANGE} 0 "STR:Environment" /TIMEOUT=5000
++ 
++  EnvVarUpdate_Restore_Vars:
++  ;
++  ; Restore the user's variables and return ResultVar
++  Pop $R0
++  Pop $9
++  Pop $8
++  Pop $7
++  Pop $6
++  Pop $5
++  Pop $4
++  Pop $3
++  Pop $2
++  Pop $1
++  Push $0  ; Push my $0 (ResultVar)
++  Exch
++  Pop $0   ; Restore his $0
++ 
++FunctionEnd
++ 
++!macroend   ; EnvVarUpdate UN
++!insertmacro EnvVarUpdate ""
++!insertmacro EnvVarUpdate "un."
++;----------------------------------- EnvVarUpdate end----------------------------------------
++ 
++!verbose pop
++!endif
 diff --git a/installers/windows/README.txt b/installers/windows/README.txt
 new file mode 100644
 --- /dev/null
 new file mode 100644
 --- /dev/null
 +++ b/installers/windows/VimClojureBox.nsi
-@@ -0,0 +1,135 @@
+@@ -0,0 +1,155 @@
 +; VimClojureBox.nsi
 +;--------------------------------
 +
++; Needed for setting env vars.
++!include "installers\windows\EnvVarUpdate.nsh"
++
 +; The name of the installer
 +Name "VimClojureBox"
 +
 +OutFile "VimClojureBox.exe"
 +
 +LicenseText "VimClojure Box License"
-+LicenseData "installers\LICENSE.txt"
++LicenseData "installers\LICENSE.rtf"
 +
 +; The default installation directory
 +InstallDir $PROGRAMFILES\VimClojureBox
 +
-+; Registry key to check for directory (so if you install again, it will
++; Registry key to check for directory (so if you install again, it will 
 +; overwrite the old one automatically)
 +InstallDirRegKey HKLM "Software\VimClojureBox" "Install_Dir"
 +
 +  ; Set output path to the installation directory.
 +  CreateDirectory "$INSTDIR"
 +  SetOutPath $INSTDIR
-+  File "installers\LICENSE.txt"
-+  File "installers\epl-v10.html"
++  File "installers\LICENSE.rtf"
 +
 +  ; Write the installation path into the registry
 +  WriteRegStr HKLM SOFTWARE\VimClojureBox "Install_Dir" "$INSTDIR"
 +  ; Jar files
 +  CreateDirectory "$INSTDIR\jars"
 +  SetOutPath $INSTDIR\jars
-+  File "build\vimclojure.jar"
 +  File "lib\*.jar"
++  File "lib\vimclojure.jar"
 +
 +  ; Executables
 +  CreateDirectory "$INSTDIR\bin"
 +  FileWrite "$0" "for %%I IN ($\"$INSTDIR\jars\*.jar$\") DO SET CP=!CP!;%%~fI$\r$\n"
 +  FileWrite "$0" "java -cp $\"%CP%$\" com.martiansoftware.nailgun.NGServer 127.0.0.1 %1 %2 %3 %4 %5 %6 %7 %8 %9$\r$\n"
 +  FileClose "$0"
-+
++  
 +  ; Set output path to the vimfiles directory in the user's home directory.
 +  ; This is where VIM plugins should be installed.
 +  ReadEnvStr $R0 "HOMEDRIVE"
 +  ReadEnvStr $R1 "HOMEPATH"
 +  SetOutPath "$R0$R1\vimfiles"
 +  File /r "tmpvimfiles\*.*"
++  IfFileExists "_vimrc" append_vimrc copy_vimrc
 +
-+  SetOutPath "$R0$R1"
-+  File "installers\windows\_vimrc"
++  copy_vimrc:
++    ; Create a starter _vimrc with no vimclojure settings.
++    File /r "installers\windows\_vimrc"
 +
-+  ; Add path to nailgun client to _vimrc
-+  GetFullPathName /SHORT $1 "$INSTDIR\bin\ng.exe"
-+  FileOpen "$0" "_vimrc" "a"
-+  FileSeek "$0" 0, END
-+  FileWrite "$0" "$\r$\nlet g:vimclojure#NailgunClient='$1'$\r$\n"
-+  FileClose "$0"
++  ; Add vimclojure settings, including short path to ng.exe.
++  ; We have to use the short path because spaces cause vimclojure to puke.
++  append_vimrc:
++    GetFullPathName /SHORT $1 "$INSTDIR\bin\ng.exe"
++    FileOpen "$0" "_vimrc" "a"
++    FileSeek "$0" 0, END
++    FileWrite "$0" "$\r$\n$\" vimclojure settings$\r$\n"
++    FileWrite "$0" "filetype plugin indent on$\r$\n"
++    FileWrite "$0" "syntax on$\r$\n"
++    FileWrite "$0" "let clj_highlight_builtins = 1$\r$\n"
++    FileWrite "$0" "let clj_highlight_contrib = 1$\r$\n"
++    FileWrite "$0" "let clj_paren_rainbow = 1$\r$\n"
++    FileWrite "$0" "let clj_want_gorilla = 1$\r$\n"
++    ; Now that we added bin to the path we don't really need the full
++    ; path to ng.exe.  I'll keep it anyway for now unless it causes problems.
++    FileWrite "$0" "let g:vimclojure#NailgunClient='$1'$\r$\n"
++    FileClose "$0"
 +
 +  CreateDirectory "$SMPROGRAMS\VimClojureBox"
 +  CreateShortCut "$SMPROGRAMS\VimClojureBox\Clojure REPL.lnk" "$INSTDIR\bin\clj.bat" "" "$INSTDIR\bin\clj.bat" 0
 +  CreateShortCut "$SMPROGRAMS\VimClojureBox\Start Nailgun Server.lnk" "$INSTDIR\bin\ng-server.bat" "" "$INSTDIR\bin\ng-server.bat" 0
 +
++  ; Add bin dir to path
++  ${EnvVarUpdate} $0 "PATH" "A" "HKLM" "$INSTDIR\bin"
++
 +SectionEnd
 +
 +;--------------------------------
 +  ; Remove shortcuts, if any
 +  Delete "$SMPROGRAMS\VimClojureBox\*.*"
 +
-+  ; Remove bin dir from PATH
-+  ; ${un.EnvVarUpdate} $0 "PATH" "R" "HKLM" "$INSTDIR\bin"
++  ; Remove bin dir from path
++  ${un.EnvVarUpdate} $0 "PATH" "R" "HKLM" "$INSTDIR\bin"
 +
 +  ; Remove directories used
 +  RMDir /r "$SMPROGRAMS\VimClojureBox"
 +  RMDir /r "$INSTDIR"
++
++  ; FIXME: Isn't that a bit unconditional?
 +  ReadEnvStr $R0 "HOMEDRIVE"
 +  ReadEnvStr $R1 "HOMEPATH"
 +  RMDir /r "$R0$R1vimfiles"
 new file mode 100644
 --- /dev/null
 +++ b/installers/windows/_vimrc
-@@ -0,0 +1,8 @@
-+filetype plugin indent on
-+syntax on
+@@ -0,0 +1,30 @@
++set nocompatible
++source $VIMRUNTIME/vimrc_example.vim
++source $VIMRUNTIME/mswin.vim
++behave mswin
 +
-+let clj_highlight_builtins = 1
-+let clj_highlight_contrib = 1
-+let clj_paren_rainbow = 1
++set diffexpr=MyDiff()
++function MyDiff()
++  let opt = '-a --binary '
++  if &diffopt =~ 'icase' | let opt = opt . '-i ' | endif
++  if &diffopt =~ 'iwhite' | let opt = opt . '-b ' | endif
++  let arg1 = v:fname_in
++  if arg1 =~ ' ' | let arg1 = '"' . arg1 . '"' | endif
++  let arg2 = v:fname_new
++  if arg2 =~ ' ' | let arg2 = '"' . arg2 . '"' | endif
++  let arg3 = v:fname_out
++  if arg3 =~ ' ' | let arg3 = '"' . arg3 . '"' | endif
++  let eq = ''
++  if $VIMRUNTIME =~ ' '
++    if &sh =~ '\<cmd'
++      let cmd = '""' . $VIMRUNTIME . '\diff"'
++      let eq = '"'
++    else
++      let cmd = substitute($VIMRUNTIME, ' ', '" ', '') . '\diff"'
++    endif
++  else
++    let cmd = $VIMRUNTIME . '\diff'
++  endif
++  silent execute '!' . cmd . ' ' . opt . arg1 . ' ' . arg2 . ' > ' . arg3 . eq
++endfunction
 +
-+let clj_want_gorilla = 1
 diff --git a/installers/windows/build.bat b/installers/windows/build.bat
 new file mode 100644
 --- /dev/null