FCL/sftools/dev/ide/carbidecppplugins: comparison imakerplugin/com.nokia.s60tools.imaker/src/com/nokia/s60tools/imaker/internal/wrapper/IMakerWrapper.java

equal deleted inserted replaced

-:61163b28edca
+:7ff23301fe22
 	private boolean runVerdict;
 	private String dProduct = null;
 //	private String dTarget = null;
 	private Pattern blockBegin = Pattern.compile("-{30,}");
-	private OutputStream outputStream;
 	private List<String> tool;
 	private IMakerCoreExecutionException lastImakerException;
 	/**
 	 * Default constructor
 	 */
 	public String getIMakerCoreVersion() throws IMakerCoreNotFoundException, IMakerCoreExecutionException {
 		verifyExists();
 		params.clear();
 		params.add(IMakerWrapperPreferences.CMD_FETCH_VERSION);
-		List<String> version = executeCommand(params);
+		List<String> version = executeCommand(params,null);
 		String vers = "";
 		for (String line : version) {
 			if(line.startsWith("iMaker")) {
 				vers = line;
 				break;
 			String newMessage = e.getMessage() +" "+ Messages.getString("IMakerWrapper.27").replace("xxx", tool.get(0));
 			throw new IMakerCoreNotFoundException(newMessage);
 		}
 	}
+	private void verifyCompatibility() throws IMakerCoreNotFoundException, IMakerCoreExecutionException {
+		//verify exists
+		String minVersion = Messages.getString("PreferencesTab.22"); //$NON-NLS-1$
+		String curVersion = IMakerUtils.parseIMakerVersion(getIMakerCoreVersion());
+		if(curVersion==null) throw new IMakerCoreExecutionException("Unable to query version information!");
+		if(minVersion.compareTo(curVersion)>0) {
+			String msg = Messages.getString("Error.3");
+			msg = msg.replace("xxx", minVersion);
+			msg = msg.replace("yyy", curVersion);
+			throw new IMakerCoreExecutionException(msg);
+		}
+	}
 	/* (non-Javadoc)
 	 * @see com.nokia.s60tools.imakerplugin.wrapper.IIMakerWrapper#getConfigurations(java.lang.String, org.eclipse.core.runtime.IProgressMonitor)
 	 */
 	public List<UIConfiguration> getConfigurations(IProgressMonitor monitor)
 	throws IMakerCoreExecutionException, IMakerCoreNotFoundException {
 		this.monitor = monitor;
-		verifyExists();
+		verifyCompatibility();
 		List<UIConfiguration> configurations = getConfigurations((String)null);
 		return configurations;
 	}
 	private List<UIConfiguration> getConfigurations(String makefile) throws IMakerCoreExecutionException {
 		if(dProduct!=null) {
 			for(UIConfiguration config: uiConfigs) {
 				String pname = config.getConfigurationName();
 				if(pname != null && pname.equals(dProduct)) {
 					config.setDefaultConfig(true);
-//					config.setDefaultTarget(dTarget);
 					break;
 				}
 			}
 		}
 		return uiConfigs;
 		params.clear();
 		params.add(IMakerWrapperPreferences.DEFAULT_DATA);// + configPath
 		Pattern product = Pattern.compile("\\s*IMAKER_CONFMK.*image_conf_(.*)\\.mk.\\s*");
 //		Pattern target  = Pattern.compile("\\s*TARGET_DEFAULT\\s*=\\s*.(.*).\\s*");
 		try {
-			List<String> lines = executeCommand(params);
+			List<String> lines = executeCommand(params,null);
 			for (String line : lines) {
 				Matcher matcher = product.matcher(line);
 				if(matcher.matches()) {
 					String pr = matcher.group(1);
 					if(!pr.equals("")) {
 	private List<String> queryMakefiles() throws IMakerCoreExecutionException {
 		List<String> makeFiles;
 		params.clear();
 		params.add(IMakerWrapperPreferences.CMD_FETCH_CONFIGURATIONS);// + configPath
-		makeFiles = executeCommand(params);
+		makeFiles = executeCommand(params,null);
 		// Remove redundant lines of information from makeFile list
 		if ((makeFiles != null) && (makeFiles.size() > 0)) {
 			List<String> tmpMakeFiles = new ArrayList<String>();
 	public UIConfiguration getConfiguration(List<String> parameters,
 			IProgressMonitor mon) throws IMakerCoreExecutionException,
 			IMakerCoreNotFoundException {
 		this.monitor = mon;
-		verifyExists();
+		verifyCompatibility();
 		if(parameters==null||parameters.size()<2) {
 			return null;
 		}
 		if (monitor != null) {
 			monitor.beginTask(Messages.getString("IMakerWrapper.4"), 2); //$NON-NLS-1$
 		params.add(makefile);
 		params.add(IMakerWrapperPreferences.CMD_FETCH_CONFIGURATION);
 		params.addAll(parameters);
 		builderRunning=true;
-		List<String> settingsList = executeCommand(params);
+		List<String> settingsList = executeCommand(params,null);
 		builderRunning=false;
 		ArrayList<ConfigurationElement> elements = new ArrayList<ConfigurationElement>();
 		ArrayList<Setting> settings = new ArrayList<Setting>();
 	/* (non-Javadoc)
 	 * @see com.nokia.s60tools.imakerplugin.wrapper.IIMakerWrapper#buildImage(java.util.List)
 	 */
 	public boolean buildImage(List<String> cmdParams, OutputStream out) throws IMakerCoreExecutionException,
 	IMakerCoreAlreadyRunningException, IMakerCoreNotFoundException {
-		this.outputStream = out;
+		verifyCompatibility();
-		verifyExists();
 		builderRunning = true;
-		List<String> ret = executeCommand(cmdParams);
+		List<String> ret = executeCommand(cmdParams,out);
 		builderRunning = false;
 		return getReturnStatus(ret);
 	}
 	private boolean getReturnStatus(List<String> ret) {
 		return xmi;
 	}
 	/**
 	 * Calls the iMaker on a command line and reads the output.
+	 * @param out
 	 *
 	 * @param  cmd additional arguments to be passed to the iMaker core.
 	 * @return Output of iMaker as list of Strings.
 	 */
-	private List<String> executeCommand(List<String> params) throws IMakerCoreExecutionException {
+	private List<String> executeCommand(List<String> params, OutputStream out) throws IMakerCoreExecutionException {
 		List<String> cmd = prepareCommand(params);
 		// Try to start a process to execute iMaker
 		try {
 			// Finally build a new ProcessBuilder with cmds.
 			builder.redirectErrorStream(true);
 			Process process = builder.start();
 			// Start reading the output
-			StreamGobbler gobbler = new StreamGobbler(process.getInputStream(), outputStream);
+			StreamGobbler gobbler = new StreamGobbler(process.getInputStream(), out);
 			gobbler.start();
 			ArrayList<String> output;
 			try {
 				exitValue = process.waitFor();
 				params.add(IMakerWrapperPreferences.CMD_FETCH_TARGETS);
 				params.add(IMakerWrapperPreferences.ARG_FETCH_CONFIGURATION);
 				params.add(makeFile);
 				List<String> prodTargets;
 				try {
-					prodTargets = executeCommand(params);
+					prodTargets = executeCommand(params,null);
 				} catch (IMakerCoreExecutionException e) {
 					this.lastImakerException = e;
 					if(monitor != null) {
 						monitor.worked(1);
 					}
 					monitor.subTask(Messages.getString("IMakerWrapper.20")+": "+makeFile); //$NON-NLS-1$
 				}
 				params.set(0, IMakerWrapperPreferences.CMD_FETCH_CONFIGURATION);
 				List<String> settingsList;
 				try {
-					settingsList = executeCommand(params);
+					settingsList = executeCommand(params,null);
 				} catch (IMakerCoreExecutionException e) {
 					this.lastImakerException = e;
 					if(monitor != null) {
 						monitor.worked(1);
 					}
 	}
 	public String getWorkdir(String makefile) throws IMakerCoreNotFoundException, IMakerCoreAlreadyRunningException, IMakerCoreExecutionException {
 		String target = "help-variable-WORKDIR*-value";
 		String retValue = null;
-		verifyExists();
+		verifyCompatibility();
 		List<String> parameters = new ArrayList<String>();
 		parameters.add("-f");
 		parameters.add(makefile);
 		parameters.add(target);
-		List<String> ret = executeCommand(parameters);
+		List<String> ret = executeCommand(parameters,null);
 		String output = ret.get(0);
 		for (String str : ret) {
 			if(str.startsWith("WORK")) {
 				output = str;
 				break;
 			if(monitor!=null) {
 				monitor.worked(1);
 				monitor.subTask(Messages.getString("IMakerWrapper.26"));
 			}
 			StringBuilder sb = new StringBuilder();
-			List<String> ret = executeCommand(cmd);
+			List<String> ret = executeCommand(cmd,null);
 			for (String str : ret) {
 				Matcher matcher = pattern.matcher(str);
 				if(matcher.find()) {
 					int end = matcher.end(1);
 					int start = matcher.start(1);
 			throws IMakerCoreNotFoundException, IMakerCoreExecutionException,
 			IMakerCoreAlreadyRunningException {
 		if(impFile==null||!impFile.exists()) {
 			throw new IMakerCoreExecutionException("Invalid imp file given!");
 		}
-		this.outputStream = out;
+		verifyCompatibility();
-		verifyExists();
 		params.clear();
 		params.add("-f");
-		params.add("\""+impFile.getAbsolutePath()+"\"");
+		params.add(getFilePath(impFile));
 		builderRunning = true;
-		List<String> ret = executeCommand(params);
+		List<String> ret = executeCommand(params,out);
 		builderRunning = false;
 		return getReturnStatus(ret);
+	}
+	private String getFilePath(File impFile) {
+		String path = impFile.getAbsolutePath();
+		if (path.contains(" ")) {
+			return "\""+path+"\"";
+		} else {
+			return path;
+		}
+	}
+	public String getBuildCommand(File impFile) {
+		StringBuffer sb = new StringBuffer();
+		sb.append(tool.get(0) + " -f " + getFilePath(impFile));
+		return sb.toString();
 	}
 }

changeset 1	7ff23301fe22
parent 0	61163b28edca
child 2	a91cb670dd8e