Index: src/org/netbeans/modules/apisupport/project/NbModuleProject.java =================================================================== RCS file: /cvs/apisupport/project/src/org/netbeans/modules/apisupport/project/NbModuleProject.java,v retrieving revision 1.125 diff -u -w -r1.125 NbModuleProject.java --- src/org/netbeans/modules/apisupport/project/NbModuleProject.java 3 Nov 2005 04:01:41 -0000 1.125 +++ src/org/netbeans/modules/apisupport/project/NbModuleProject.java 9 Nov 2005 12:34:15 -0000 @@ -123,6 +123,9 @@ throw new IOException("Misconfigured project in " + FileUtil.getFileDisplayName(getProjectDirectory()) + " has no defined "); // NOI18N } typeProvider = new NbModuleTypeProviderImpl(); + if (typeProvider.getModuleType() == NbModuleTypeProvider.STANDALONE) { + updatePlatformPrivateProperties(helper, true); // hotfix for 67892 + } eval = createEvaluator(null); FileBuiltQueryImplementation fileBuilt; // XXX could add globs for other package roots too @@ -1107,14 +1110,9 @@ assert compile != null : "No COMPILE path"; // write user.properties.file=$userdir/build.properties to platform-private.properties if (getModuleType() == NbModuleTypeProvider.STANDALONE) { - // XXX skip this in case nbplatform.active is not defined ProjectManager.mutex().writeAccess(new Mutex.Action() { public Object run() { - String path = "nbproject/private/platform-private.properties"; // NOI18N - EditableProperties ep = getHelper().getProperties(path); - File buildProperties = new File(System.getProperty("netbeans.user"), "build.properties"); // NOI18N - ep.setProperty("user.properties.file", buildProperties.getAbsolutePath()); //NOI18N - getHelper().putProperties(path, ep); + updatePlatformPrivateProperties(helper, false); try { ProjectManager.getDefault().saveProject(NbModuleProject.this); } catch (IOException e) { @@ -1161,6 +1159,23 @@ compile = null; } + } + + private static void updatePlatformPrivateProperties(final AntProjectHelper helper, boolean silent) { + // XXX skip this in case nbplatform.active is not defined + String path = "nbproject/private/platform-private.properties"; // NOI18N + EditableProperties ep = helper.getProperties(path); + File buildProperties = new File(System.getProperty("netbeans.user"), "build.properties"); // NOI18N + ep.setProperty("user.properties.file", buildProperties.getAbsolutePath()); //NOI18N + if (silent) { + try { + Util.storeProperties(FileUtil.createData(helper.getProjectDirectory(), path), ep); + } catch (IOException e) { + Util.err.notify(ErrorManager.INFORMATIONAL, e); + } + } else { + helper.putProperties(path, ep); + } } private final class SavedHook extends ProjectXmlSavedHook {