sigonasr2/jmonkeyengine
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

SDK:

Browse Source 
- change jMP to use netbeans user dir variable for natives extraction
- change OgreXML command line tools to be expanded to netbeans user dir

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8051 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
This commit is contained in:
nor..67 2011-08-21 18:40:55 +00:00
parent 7acd4e7faf
commit 16e0403ab7
2 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
sdk/jme3-core/src/com/jme3/gde/core/Installer.java
View File

@ -33,13 +33,10 @@ package com.jme3.gde.core;
import com.jme3.gde.core.scene.SceneApplication;
import java.io.File;
import java.util.Iterator;
import java.util.List;
import javax.swing.JPopupMenu;
import org.openide.filesystems.FileChooserBuilder;
import org.openide.modules.ModuleInstall;
import org.openide.util.NbPreferences;
import org.openide.util.Utilities;
/**
* Manages a module's lifecycle. Remember that an installer is optional and
@ -63,11 +60,10 @@ public class Installer extends ModuleInstall {
//set default projects directory
// File userDir = new File(System.getProperty("user.home"));
// File myProjectsDir = new File(userDir, "jMonkeyProjects");
// if (!myProjectsDir.exists()) {
// myProjectsDir.mkdirs();
// }
//select project folder
String projectDir = NbPreferences.forModule(Installer.class).get("projects_path", null);
if (projectDir == null) {
@ -86,20 +82,26 @@ public class Installer extends ModuleInstall {
NbPreferences.forModule(Installer.class).put("projects_path", projectDir);
}
}
System.setProperty("netbeans.projects.dir", projectDir);
//set extraction dir for platform natives
if (Utilities.isMac()) {
String jmpDir = System.getProperty("user.home") + "/Library/Application Support/jmonkeyplatform/";
File file = new File(jmpDir);
String jmpDir = System.getProperty("netbeans.user");
File file = new File(jmpDir);
if (!file.exists()) {
file.mkdirs();
com.jme3.system.Natives.setExtractionDir(jmpDir);
} else {
String jmpDir = System.getProperty("user.home") + File.separator + ".jmonkeyplatform" + File.separator;
File file = new File(jmpDir);
file.mkdirs();
com.jme3.system.Natives.setExtractionDir(jmpDir);
}
com.jme3.system.Natives.setExtractionDir(jmpDir);
// if (Utilities.isMac()) {
// String jmpDir = System.getProperty("user.home") + "/Library/Application Support/jmonkeyplatform/";
// File file = new File(jmpDir);
// file.mkdirs();
// com.jme3.system.Natives.setExtractionDir(jmpDir);
// } else {
// String jmpDir = System.getProperty("user.home") + File.separator + ".jmonkeyplatform" + File.separator;
// File file = new File(jmpDir);
// file.mkdirs();
// com.jme3.system.Natives.setExtractionDir(jmpDir);
// }
//avoid problems with lightweight popups
JPopupMenu.setDefaultLightWeightPopupEnabled(false);

6
sdk/jme3-ogretools/src/com/jme3/gde/ogretools/convert/OgreXMLConvert.java
View File

@ -26,9 +26,9 @@ import org.openide.util.Utilities;
public class OgreXMLConvert {
static final int BUFFER = 2048;
public static String osx_path = System.getProperty("user.home") + "/Library/Application Support/jmonkeyplatform/ogretools/";
public static String windows_path = System.getProperty("user.home") + "\\.jmonkeyplatform\\ogretools\\";
public static String linux_path = System.getProperty("user.home") + "/.jmonkeyplatform/ogretools/";
public static String osx_path = System.getProperty("netbeans.user") + "/ogretools/";
public static String windows_path = System.getProperty("netbeans.user") + "\\ogretools\\";
public static String linux_path = System.getProperty("netbeans.user") + "/.ogretools/";
public boolean doConvert(OgreXMLConvertOptions options, ProgressHandle handle) {
if (!checkTools()) {