浏览代码

[#89] Adjust README to reflect moved dir.

- fixed a couple typos too.
John S. Ryan 10 年前
父节点
当前提交
cdb1da854b
共有 1 个文件被更改,包括 15 次插入7 次删除
  1. 15
    7
      README.md

+ 15
- 7
README.md 查看文件

@@ -102,7 +102,7 @@ If you want more details, check out the [x-api README](https://github.com/exerci
102 102
 	git remote add upstream https://github.com/exercism/xjava.git
103 103
 	git pull --rebase upstream/master
104 104
 	cd ~/workspace/exercism/x-api/tracks
105
-	rm -rf java
105
+	mv java java-original
106 106
 	ln -s ../../xjava java
107 107
 	```
108 108
 
@@ -127,6 +127,7 @@ The rootproject is a container for the problem subprojects.
127 127
 
128 128
 ### The Problem Subprojects
129 129
 
130
+The `exercises` subdirectory contains all of the problem subprojects.
130 131
 Each problem/subproject is a subdirectory of the same name as its slug.
131 132
 
132 133
   * it's `build.gradle` names dependencies required to work that problem.
@@ -142,14 +143,14 @@ Each problem/subproject has three source sets:
142 143
 To run all the tests against example code:
143 144
 
144 145
 ```
145
-cd ~/workspace/exercism/xjava
146
+cd ~/workspace/exercism/xjava/exercises
146 147
 gradle assemble check
147 148
 ```
148 149
 
149 150
 To run the test against just one problem, run gradle from within that directory:
150 151
 
151 152
 ```
152
-cd ~/workspace/exercism/xjava/bob
153
+cd ~/workspace/exercism/xjava/exercises/bob
153 154
 gradle assemble check
154 155
 ```
155 156
 
@@ -182,9 +183,9 @@ and if you review the logs of your x-api, you'll find:
182 183
 This is because some files generated by the build can't be served from the x-api.  That's actually fine.  To fix this, simply make sure you do a clean in your xjava repo before you fetch:
183 184
 
184 185
 ```
185
-cd ~/workspace/exercism/xjava
186
+cd ~/workspace/exercism/xjava/exercises
186 187
 gradle clean
187
-cd ~/worksapce/exercism/exercises
188
+cd ~/workspace/exercism/exercises
188 189
 exercism fetch java bob
189 190
 ```
190 191
 
@@ -208,7 +209,14 @@ Before you submit a pull request, please ensure:
208 209
    ./bin/build.sh
209 210
    ```
210 211
 
211
-   verify that the script runs successfully.
212
+   ...verify that the script runs successfully.
213
+
214
+   Then, since your x-api is serving from this directory, make it pristine (see [Tip: gradle clean before exercism fetch](#tip-gradle-clean-before-exercism-fetch) for details):
215
+
216
+   ```
217
+   cd ~/workspace/exercism/xjava/exercises
218
+   gradle clean
219
+   ```
212 220
 
213 221
 2. **Fetch the problem from your local x-api, using the CLI.**
214 222
 
@@ -223,7 +231,7 @@ Before you submit a pull request, please ensure:
223 231
 
224 232
    ```
225 233
    cd ~/workspace/exercism/exercises/java/<problem-slug>
226
-   cp ../../../xjava/<problem-slug>/src/example/java/* src/main/java
234
+   cp ~/workspace/exercism/xjava/exercises/<problem-slug>/src/example/java/* src/main/java
227 235
    gradle check
228 236
    ```
229 237