Codebase list plm / cac31b2
refresh all patches (only fuzzy lines) Martin Quinson 3 years ago
4 changed file(s) with 12 addition(s) and 12 deletion(s). Raw diff Collapse all Expand all
+1
-1
debian/patches/chmod less more
77 ===================================================================
88 --- a/build.xml
99 +++ b/build.xml
10 @@ -224,7 +224,9 @@
10 @@ -231,7 +231,9 @@
1111 <arg value="l10n/engine/fr.po"/>
1212 <redirector output="errors-msgstr.txt" alwayslog="true"/>
1313 </exec>
+7
-7
debian/patches/json-simple-3.patch less more
179179
180180 import plm.core.UserSwitchesListener;
181181 import plm.core.lang.ProgrammingLanguage;
182 @@ -101,7 +101,7 @@ public class GitSpy implements ProgressS
182 @@ -105,7 +105,7 @@ public class GitSpy implements ProgressS
183183 createFiles(exo);
184184 checkSuccess(exo);
185185
188188 String userUUID = Game.getInstance().getUsers().getCurrentUser().getUserUUIDasString();
189189 String userBranch = "PLM"+GitUtils.sha1(userUUID);
190190
191 @@ -122,7 +122,7 @@ public class GitSpy implements ProgressS
191 @@ -126,7 +126,7 @@ public class GitSpy implements ProgressS
192192 createFiles(lastExo);
193193
194194 try {
197197 String userUUID = Game.getInstance().getUsers().getCurrentUser().getUserUUIDasString();
198198 String userBranch = "PLM"+GitUtils.sha1(userUUID);
199199
200 @@ -138,7 +138,7 @@ public class GitSpy implements ProgressS
200 @@ -142,7 +142,7 @@ public class GitSpy implements ProgressS
201201 try {
202202 deleteFiles(exo);
203203
206206 String userUUID = Game.getInstance().getUsers().getCurrentUser().getUserUUIDasString();
207207 String userBranch = "PLM"+GitUtils.sha1(userUUID);
208208
209 @@ -185,7 +185,7 @@ public class GitSpy implements ProgressS
209 @@ -189,7 +189,7 @@ public class GitSpy implements ProgressS
210210 * Helper methods
211211 */
212212 @SuppressWarnings("unchecked")
215215
216216 ExecutionProgress lastResult = exoFrom.lastResult;
217217
218 @@ -229,7 +229,7 @@ public class GitSpy implements ProgressS
218 @@ -233,7 +233,7 @@ public class GitSpy implements ProgressS
219219 */
220220 @SuppressWarnings("unchecked")
221221 private String writePLMStartedOrLeavedCommitMessage(String kind) {
224224
225225 // Retrieve the feedback informations
226226 jsonObject.put("java", System.getProperty("java.version") + " (VM: " + System.getProperty("java.vm.name") + "; version: " + System.getProperty("java.vm.version") + ")");
227 @@ -362,7 +362,7 @@ public class GitSpy implements ProgressS
227 @@ -366,7 +366,7 @@ public class GitSpy implements ProgressS
228228 e.printStackTrace();
229229 }
230230
233233 msg.put("studentInput", studentInput);
234234 String commitMsg = writeCommitMessage(lastExo, null, evt_type, msg);
235235 String userUUID = Game.getInstance().getUsers().getCurrentUser().getUserUUIDasString();
236 @@ -395,7 +395,7 @@ public class GitSpy implements ProgressS
236 @@ -399,7 +399,7 @@ public class GitSpy implements ProgressS
237237 e.printStackTrace();
238238 }
239239
+1
-1
debian/patches/jython-fixes less more
88 ===================================================================
99 --- a/src/plm/core/model/Game.java
1010 +++ b/src/plm/core/model/Game.java
11 @@ -250,11 +250,9 @@ public class Game implements IWorldView
11 @@ -251,11 +251,9 @@ public class Game implements IWorldView
1212 String pythonError = "";
1313 private boolean checkPython() {
1414 String[] resources = new String[] {
+3
-3
debian/patches/system-ant-tasks less more
4747 </classpath>
4848 </taskdef>
4949
50 @@ -94,7 +108,7 @@
50 @@ -101,7 +115,7 @@
5151
5252 <target name="dist" depends="clean, compile, source, i18n-generate-jar, updateversion" description="build a standalone application jar file">
5353 <mkdir dir="${dist.dir}"/>
5656 <manifest>
5757 <attribute name="Built-By" value="M. Quinson, G. Oster and others" />
5858 <attribute name="Main-Class" value="plm.core.ui.ProgrammersLearningMachine" />
59 @@ -105,38 +119,8 @@
59 @@ -112,38 +126,8 @@
6060 <fileset dir="${base.dir}" includes="img/*/*.png img/*.png" excludes="*"/>
6161 <fileset dir="${base.dir}" includes="ChangeLog" />
6262 <fileset dir="${lib.dir}" excludes="**/*.jar *.pl l10n/missions/* l10n/engine/*"/>
9595 </jar>
9696 </target>
9797
98 @@ -180,7 +164,7 @@
98 @@ -187,7 +171,7 @@
9999 </propertyfile>
100100 </target>
101101