PL file can have absolute or relative path

Author: ursgraf

microzedExampleProject.deep

@@ -13,12 +13,13 @@ project microzedExampleProject {
 	ostype = sts_arm;
 	programmertype = openOCD;
 	programmeropts = localhost_4444;
-	imgfile = "C:\temp\Test1";
+	imgfile = "C:\Users\urs.graf\OneDrive - OST\Desktop/Base";
+	pl_file = "C:\Users\urs.graf\OneDrive - OST\Dokumente\OST\Software\EUser\JCC\org.deepjava.trglib\rsc\flink4.bit";
 #	tctfile = "tct/targetCommands.dtct";
 
 #	rootclasses = "java.lang.Object";
 #	rootclasses = "org.deepjava.runtime.zynq7000.Reset";
 	rootclasses = "org.deepjava.runtime.zynq7000.demo.SystemOutDemo";
-	rootclasses = "org.deepjava.runtime.zynq7000.microzed.demo.Blinker";
-	rootclasses = "org.deepjava.runtime.zynq7000.demo.SystemOutDemo","org.deepjava.runtime.zynq7000.microzed.demo.Blinker";
+	rootclasses = "org.deepjava.runtime.zynq7000.microzed.test.RTBoardTest";
+#	rootclasses = "org.deepjava.runtime.zynq7000.demo.SystemOutDemo","org.deepjava.runtime.zynq7000.microzed.demo.Blinker";
 }

src/org/deepjava/eclipse/ui/wizard/DeepProjectWizard.java

@@ -207,7 +207,9 @@ private void createProject(IProgressMonitor monitor) {
 			if (model != null && !model.getLoadPlFile()) sb.append("#");
 			sb.append("\tpl_file = ");
 			if (model != null && model.getPlFilePath() == null) {
-				sb.append("none");
+				str = model.getLibrary().getAbsolutePath();
+				str = str.replace('/', '\\');
+				sb.append(str);
 			} else {
 				str = model.getPlFilePath().getAbsolutePath();
 				str = str.replace('/', '\\');

src/org/deepjava/eclipse/ui/wizard/TargetConfigPage.java

@@ -51,7 +51,7 @@ class TargetConfigPage extends WizardPage {
 	private Button checkImg, browseImg, downloadPL, browsePL;
 	private Text programmerOpts, pathImg, pathPL;
 	private final String defaultImgPath = "$PROJECT_LOCATION";
-	private final String defaultPlPath = "$PROJECT_LOCATION";
+	private final String defaultPlPath = "\\rsc\\flink2.bit";
 	private String lastChoice = defaultImgPath;
 	private String lastChoicePl = defaultPlPath;
 	private String[][] boards;
@@ -169,7 +169,10 @@ public void widgetSelected(SelectionEvent e) {
 				if(e.widget.equals(downloadPL)) {
 					if(downloadPL.getSelection()) {
 						pathPL.setEnabled(true);
-						pathPL.setText(defaultPlPath);
+						if (((DeepProjectWizard)getWizard()).model.getLibrary() != null) {
+							File lib = ((DeepProjectWizard)getWizard()).model.getLibrary();
+							pathPL.setText(lib.getAbsolutePath() + defaultPlPath);
+						} else pathPL.setText(defaultPlPath);
 						browsePL.setEnabled(true);
 					} else {
 						pathPL.setEnabled(false);
@@ -276,9 +279,9 @@ private boolean validatePage() {
 		wiz.model.setCreateImgFile(checkImg.getSelection());
 		if (lastChoice != defaultImgPath) wiz.model.setImgPath(new File(lastChoice));
 		else wiz.model.setImgPath(null);
+		if (wiz.model.getImgPath() != null) System.out.println(wiz.model.getImgPath().getPath());
 		wiz.model.setLoadPlFile(downloadPL.getSelection());
-		if (lastChoicePl != defaultPlPath) wiz.model.setPlFilePath(new File(lastChoicePl));
-		else wiz.model.setPlFilePath(null);
+		wiz.model.setPlFilePath(new File(wiz.model.getLibrary().getAbsolutePath() + lastChoicePl));
 		return true;
 	}