diff --git a/.classpath b/.classpath new file mode 100644 index 0000000..0914d5f --- /dev/null +++ b/.classpath @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/.gitignore b/.gitignore index 0199737..8ff4073 100644 --- a/.gitignore +++ b/.gitignore @@ -1,16 +1,2 @@ -translations/ -/errordb.txt -/exceptiondb.txt -/mnemdb.json -/ntstatusdb.txt -/winconstants.txt -/x64dbg.chm -/x96dbg.exe -/x32/x32bridge.dll -/x32/x32dbg.dll -/x32/x32dbg.exe -/x32/x32gui.dll -/x64/x64bridge.dll -/x64/x64dbg.dll -/x64/x64dbg.exe -/x64/x64gui.dll \ No newline at end of file +/build/ +.settings diff --git a/.project b/.project new file mode 100644 index 0000000..93bf9c1 --- /dev/null +++ b/.project @@ -0,0 +1,17 @@ + + + ceylon-bootstrap + + + + + + org.eclipse.jdt.core.javabuilder + + + + + + org.eclipse.jdt.core.javanature + + diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..d645695 --- /dev/null +++ b/LICENSE @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) 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. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/README.md b/README.md new file mode 100644 index 0000000..c418b75 --- /dev/null +++ b/README.md @@ -0,0 +1,36 @@ +Ceylon bootstrap +================ + +License +------- + +The content of this repository is released under the ASL v2.0 +as provided in the LICENSE file that accompanied this code. + +By submitting a "pull request" or otherwise contributing to this repository, you +agree to license your contribution under the license mentioned above. + +Directory structure +------------------- + +* `src` - the Ceylon bootstrap module sources +* `test-src` - the Ceylon bootstrap module unit tests + +Build the module +---------------- + +For setting up the development environment and compiling and building the distribution +take a look at [ceylon-dist](https://github.com/ceylon/ceylon-dist#ceylon-distribution). + +If after having built the distribution you want to build the module run + + ant clean publish + +And to run the tests type + + ant test + +Once built, the module lives in this jar: + + ~/.ceylon/repo/ceylon/bootstrap/0.2/ceylon.bootstrap-0.2.jar + diff --git a/antplugin.gradle b/antplugin.gradle new file mode 100644 index 0000000..95ce1e4 --- /dev/null +++ b/antplugin.gradle @@ -0,0 +1,45 @@ +apply plugin : CeylonCommonBuildProperties +apply plugin: 'java' + +sourceCompatibility = cbp.'compile.java.source' +targetCompatibility = cbp.'compile.java.target' + +dependencies { + compile project(':cli') + compileOnly project(':common') + compile antDep + testCompile junitDep +} + +sourceSets { + main { + java { + srcDirs = [ "${project(':compiler-java').projectDir}/src"] + include 'org/eclipse/ceylon/ant/**' + include 'org/eclipse/ceylon/launcher/**' + } + resources { + srcDirs = [ "${project(':compiler-java').projectDir}/src"] + include "org/eclipse/ceylon/ant/antlib.xml" + } + } +} + +jar { + description 'Create Ant tasks jar' + archiveName = 'ceylon-ant.jar' + + from ({zipTree(project(':common').configurations.default.allArtifacts.files.singleFile)}) { + include 'org/eclipse/ceylon/common/**' + exclude 'org/eclipse/ceylon/common/log/**' + exclude 'org/eclipse/ceylon/common/resources/**' + } +} + +task publishInternal( type : Copy ) { + group 'Distribution' + description 'Copies binary artifacts to distribution area' + from jar + into repoLibDir +} + diff --git a/bootstrap.gradle b/bootstrap.gradle new file mode 100644 index 0000000..768ce58 --- /dev/null +++ b/bootstrap.gradle @@ -0,0 +1,13 @@ +import org.apache.tools.ant.filters.ReplaceTokens + +ext { + ceylonModuleName = 'bootstrap' + ceylonNamespace = 'ceylon' +} + +apply from : "${rootProject.projectDir}/gradle/java-for-modules.gradle" + +dependencies { + compile project(':common') +} + diff --git a/build.xml b/build.xml new file mode 100644 index 0000000..cf35914 --- /dev/null +++ b/build.xml @@ -0,0 +1,242 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${archiveFileName} + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.pde.ManifestBuilder + + + + + org.eclipse.pde.SchemaBuilder + + + + + + org.eclipse.pde.PluginNature + org.eclipse.jdt.core.javanature + + + + project + 2 + PARENT-3-PROJECT_LOC/ceylon/cli + + +]]> + + + + + + +]]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + No tests (yet) + + diff --git a/jdk-copy.sh b/jdk-copy.sh new file mode 100644 index 0000000..a9e705d --- /dev/null +++ b/jdk-copy.sh @@ -0,0 +1,44 @@ +#! /bin/bash + +# jdk-diff has produced two .diff files for each component. This script will +# copy the $NEW JDK files into the Ceylon source tree. +# The source tree will be left in a non-compilable state, with the +# pristine JDK packages (using JDK package names) in the right place. + + + + +# source some common stuff used by this and the patch script +. $(dirname $0)/renames + +# Get a copy of the new tree if it doesn't exist +if [ ! -e "$NEW" ]; then + hg clone "$NEW_URL" "$NEW" +fi + +ln -s "$NEW" "compiler-java/$NEW" + +git rm -r compiler-java/langtools/src/share/classes/ +git rm -r langtools-classfile/src + +## Copy packages +for d in javax/annotation/processing javax/lang/model javax/tools com/sun/source com/sun/tools/javac +do + mkdir -p $(dirname compiler-java/langtools/src/share/classes/$d) + cp -r $NEW/src/share/classes/$d $(dirname compiler-java/langtools/src/share/classes/$d) +done + +for d in com/sun/tools/classfile +do + mkdir -p $(dirname langtools-classfile/src/$d) + cp -r $NEW/src/share/classes/$d $(dirname langtools-classfile/src/$d) +done + +# COMMIT +git add compiler-java/langtools/src/share/classes/ +git add langtools-classfile/src + +echo "Now do a git status and make a commit. Then run jdk-patch.sh" + + + diff --git a/jdk-diff.sh b/jdk-diff.sh new file mode 100644 index 0000000..3e206b0 --- /dev/null +++ b/jdk-diff.sh @@ -0,0 +1,95 @@ +#! /bin/bash + +# Creates a couple of .diff files of our changes since the +# last JDK javac rebase. +# Running this script will: +# +# * Clone the OLD mercurial repo defined in `renames` +# * Create a couple of of .diff files +# * Revert the git working tree (so start clean!) +# +# It will not make any git commits + +#set -x + +# source some common stuff used by this and the patch script +. $(dirname $0)/renames + +DIFF_FLAGS=-aurwB + +# run from the git repo root +cd $(git rev-parse --show-toplevel) + +# Get a copy of the old tree if it doesn't exist +if [ ! -e "$OLD" ]; then + hg clone "$OLD_URL" "$OLD" +fi + +# In ceylon-compiler +cd compiler-java + +# Add a symlink to the old javac source tree +# (so that the diff is done on sibling directories, since patch needs that) +ln -s "../$OLD" "$OLD" + +# Rename packages to where the JDK expects them +renamePackage langtools/src/share/classes \ + org.eclipse.ceylon.javax.annotation.processing \ + javax.annotation.processing \ + renames + +renamePackage langtools/src/share/classes \ + org.eclipse.ceylon.javax.lang.model \ + javax.lang.model \ + renames + +renamePackage langtools/src/share/classes \ + org.eclipse.ceylon.javax.tools \ + javax.tools \ + renames + +renamePackage langtools/src/share/classes \ + org.eclipse.ceylon.langtools.source \ + com.sun.source \ + renames + +renamePackage langtools/src/share/classes \ + org.eclipse.ceylon.langtools.tools.javac \ + com.sun.tools.javac \ + renames + +echo "Creating diff for compiler-java" +diff $DIFF_FLAGS "${OLD}" langtools | grep -v '^Only in langtools-7' > ../compiler-java.diff + +# So we got a patch file, but we've also screwed up the working tree +# (it's now using javac package names). Use git to revert +git checkout -- . +# This will also delete the link we created +git clean -f -d + +cd .. + +# Now the same in langtools-classfile +cd langtools-classfile + +# Add a symlink to the old javac source tree +# (so that the diff is done on sibling directories, since patch needs that) +ln -s "../$OLD/src/share/classes" "src-old" + +renamePackage ./src \ + org.eclipse.ceylon.langtools.classfile \ + com.sun.tools.classfile \ + renames + +echo "Creating diff for langtools-classfile" +diff $DIFF_FLAGS "src-old" src | grep -v '^Only in src-old' > ../langtools-classfile.diff + +git checkout -- . +# This will also delete the link we created +git clean -f -d + +cd .. + +echo "Now run jdk-copy.sh" + +#set +x diff --git a/jdk-patch.sh b/jdk-patch.sh new file mode 100644 index 0000000..88b9e7c --- /dev/null +++ b/jdk-patch.sh @@ -0,0 +1,70 @@ +#! /bin/bash + +# jdk-diff.sh has produced two .diff files for each component, and +# jdk-copy.sh has copied the $NEW sources into the right source directories +# +# We now: +# +# 1. Apply the patches produced by jdk-diff.sh +# 2. Rename the javac packages to the ceylon package names + + +# source some common stuff used by this and the patch script +. $(dirname $0)/renames + +# Get a copy of the new tree if it doesn't exist +if [ ! -e "$NEW" ]; then + echo "There is no $NEW, jdk-copy.sh should have created this. Something's wrong." + echo "Exiting." + exit 1 +fi + +# Apply the diff +echo "Patching compiler-java" +patch -p1 -d compiler-java/langtools -N < compiler-java.diff + +echo "Patching langtools-classfile" +patch -p1 -d langtools-classfile/src -N < langtools-classfile.diff + +echo "Package renaming" +# Now do the reverse rename within the JDK tree +cd compiler-java +renamePackage langtools/src/share/classes \ + javax.annotation.processing \ + org.eclipse.ceylon.javax.annotation.processing \ + rev_renames + +renamePackage langtools/src/share/classes \ + javax.lang.model \ + org.eclipse.ceylon.javax.lang.model \ + rev_renames + +renamePackage langtools/src/share/classes \ + javax.tools \ + org.eclipse.ceylon.javax.tools \ + rev_renames + +renamePackage langtools/src/share/classes \ + com.sun.source \ + org.eclipse.ceylon.langtools.source \ + rev_renames + +renamePackage langtools/src/share/classes \ + com.sun.tools.javac \ + org.eclipse.ceylon.langtools.tools.javac \ + rev_renames + +cd .. + +cd langtools-classfile +renamePackage ./src \ + com.sun.tools.classfile \ + org.eclipse.ceylon.langtools.classfile \ + rev_renames + +cd .. + +echo "Now the tedious bit: You need to review all the rejected patches." +echo "Look for .rej files in the source trees." +echo "Many of these will be just imports" +echo "Good luck." diff --git a/renames b/renames new file mode 100644 index 0000000..f16dad3 --- /dev/null +++ b/renames @@ -0,0 +1,57 @@ +OLD=langtools-7 +OLD_URL=http://hg.openjdk.java.net/jdk7/jdk7/langtools/ +NEW=langtools-8u +NEW_URL=http://hg.openjdk.java.net/jdk8u/jdk8u/langtools/ + +# The package renames +declare -A renames +renames[org.eclipse.ceylon.javax.annotation.processing]=javax.annotation.processing +renames[org.eclipse.ceylon.javax.lang.model]=javax.lang.model +renames[org.eclipse.ceylon.javax.tools]=javax.tools +renames[org.eclipse.ceylon.langtools.source]=com.sun.source +renames[org.eclipse.ceylon.langtools.tools.javac]=com.sun.tools.javac +renames[org.eclipse.ceylon.langtools.classfile]=com.sun.tools.classfile + +# The inverse mapping of those renames +declare -A rev_renames +for c in "${!renames[@]}" +do + rev_renames[${renames[$c]}]=$c +done + +# Refactors sources from one package name to another +function renamePackage { + SRC_DIR=$1 + + CEYLON_PACKAGE=$2 + JDK_PACKAGE=$3 + declare -n mapping=$4 + + CEYLON_DIR=$(echo $CEYLON_PACKAGE | sed 's#\.#/#g') + JDK_DIR=$(echo $JDK_PACKAGE | sed 's#\.#/#g') + + #echo $JDK_DIR + + CEYLON_PACKAGE_RE=$(echo $CEYLON_PACKAGE | sed 's#\.#\\.#g') + #JDK_PACKAGE_RE=$(echo $JDK_PACKAGE | sed 's#\.#\\.#g') + + #echo $CEYLON_PACKAGE_RE + + # Move the files + mkdir -p "${SRC_DIR}/$(dirname ${JDK_DIR})" + #cp -r ${SRC_DIR}/${CEYLON_DIR} \ + # ${SRC_DIR}/${JDK_DIR} + mv "${SRC_DIR}/${CEYLON_DIR}" "${SRC_DIR}/${JDK_DIR}" + # Fix the package declaration + #find ${SRC_DIR}/${JDK_DIR} -name '*.java' -exec sed -i -r "s/^package ${CEYLON_PACKAGE_RE}(.*);/package ${JDK_PACKAGE}\1;/" {} \; + + for c in "${!mapping[@]}" + do + RE=$(echo $c | sed 's#\.#\\.#g') + J=${mapping[$c]} + #echo "s/$RE([a-zA-Z0-8_]*)/$J\1/g" + # Fix the imports + find ${SRC_DIR}/${JDK_DIR} -name '*.java' -exec sed -i -r "s/$RE([a-zA-Z0-8_]*)/$J\1/g" {} \; + done + #find ${SRC_DIR}/${JDK_DIR} -name '*.java' -exec sed -i -r 's/^import org\.eclipse\.ceylon.(.*);/import \1;/g' {} \; +}