diff --git a/.gitignore b/.gitignore index 871ca9f26..bedb96782 100644 --- a/.gitignore +++ b/.gitignore @@ -20,6 +20,7 @@ docs/[A-Z]* # Generated assets static/assets/[A-Z]* +src/rascal/demo # Misc .DS_Store diff --git a/META-INF/RASCAL.MF b/META-INF/RASCAL.MF index 2ff43ed80..69abb6629 100644 --- a/META-INF/RASCAL.MF +++ b/META-INF/RASCAL.MF @@ -1,3 +1,3 @@ Project-Name: rascal-website -Source: courses/Recipes, courses/Rascal +Source: courses/Recipes, courses/Rascal, src/temp Require-Libraries: |lib://rascal-tutor| diff --git a/courses/Recipes/Toys/Hello/Hello.md b/courses/Recipes/Toys/Hello/Hello.md index c3b98abdb..02631f7d3 100644 --- a/courses/Recipes/Toys/Hello/Hello.md +++ b/courses/Recipes/Toys/Hello/Hello.md @@ -2,7 +2,7 @@ title: Hello --- -The "Hello" example shows where to put your code such that it can do _something_. In this +The _Hello_ example shows where to put your code such that it can do _something_. In this case all we do is print `Hello World...`. After you know where to put code such that it can be executed, you can replace the slightly silly example with more useful things. @@ -68,21 +68,9 @@ void hello() { This module should be placed in `/src/demo/basic/Hello.rsc`. -```rascal-prepare -import IO; -writeFile(|test-modules:///demo/basic/Hello.rsc|, -"module demo::basic::Hello -' -'import IO; -' -'void hello() { -' println(\"Hello world, this is my first Rascal program!\"); -'}"); -``` - Using this `Hello` module is now simple: -```rascal-shell +``` import demo::basic::Hello; hello(); ``` diff --git a/pom.xml b/pom.xml index 10b38ea66..55a13aa32 100644 --- a/pom.xml +++ b/pom.xml @@ -24,18 +24,18 @@ UTF-8 UTF-8 - 0.20.1 - 0.33.7 - 0.14.0 - 0.9.4 - 0.1.13 - 0.2.2 - 0.8.9 - 0.2.2 - 0.2.2 - 2.18.0 - 0.1.10 - 0.2.2 + 0.22.0 + 0.34.0 + 0.15.0 + 0.10.1 + 0.1.14 + 0.2.3 + 0.8.10 + 0.2.3 + 0.2.4 + 2.19.0 + 0.2.0 + 0.2.3 @@ -187,10 +187,12 @@ ${project.basedir}/courses/GettingStarted ${project.basedir}/courses/Rascalopedia ${project.basedir}/courses/Bibliography + ${project.basedir}/src/rascal |lib://rascal/org/rascalmpl/library/lang/rascal| |lib://rascal/org/rascalmpl/library/lang/c90| + ${project.basedir}/src/rascal/demo diff --git a/src/rascal/README.txt b/src/rascal/README.txt new file mode 100644 index 000000000..66d895ea7 --- /dev/null +++ b/src/rascal/README.txt @@ -0,0 +1,2 @@ +This folder is for temporary modules generated by the documentation scripts in +rascal-shell blocks.