SDK:
- enable Upgrader plugin git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9861 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
This commit is contained in:
		
							parent
							
								
									6e04761cf3
								
							
						
					
					
						commit
						5e306dc739
					
				| @ -56,6 +56,8 @@ | ||||
|                 <replacestring from="-J-Xmx64m" to="${run.args.extra}"/> | ||||
|             </filterchain> | ||||
|         </copy> | ||||
|         <copy file="jmonkeyplatform.import" tofile="build/launcher/etc/jmonkeyplatform.import"/> | ||||
|         <copy file="jmonkeyplatform.import" tofile="build/etc/jmonkeyplatform.import"/> | ||||
|     </target> | ||||
| 
 | ||||
|     <!--zips up the templates and adds them to the template project--> | ||||
|  | ||||
| @ -30,6 +30,14 @@ | ||||
|                         <specification-version>3.0.0</specification-version> | ||||
|                     </run-dependency> | ||||
|                 </dependency> | ||||
|                 <dependency> | ||||
|                     <code-name-base>com.jme3.gde.upgrader</code-name-base> | ||||
|                     <build-prerequisite/> | ||||
|                     <compile-dependency/> | ||||
|                     <run-dependency> | ||||
|                         <specification-version>3.0.0</specification-version> | ||||
|                     </run-dependency> | ||||
|                 </dependency> | ||||
|                 <dependency> | ||||
|                     <code-name-base>org.apache.commons.logging</code-name-base> | ||||
|                     <build-prerequisite/> | ||||
| @ -177,6 +185,15 @@ | ||||
|                         <specification-version>1.22.1.1</specification-version> | ||||
|                     </run-dependency> | ||||
|                 </dependency> | ||||
|                 <dependency> | ||||
|                     <code-name-base>org.netbeans.spi.navigator</code-name-base> | ||||
|                     <build-prerequisite/> | ||||
|                     <compile-dependency/> | ||||
|                     <run-dependency> | ||||
|                         <release-version>1</release-version> | ||||
|                         <specification-version>1.23.1</specification-version> | ||||
|                     </run-dependency> | ||||
|                 </dependency> | ||||
|                 <dependency> | ||||
|                     <code-name-base>org.netbeans.spi.palette</code-name-base> | ||||
|                     <build-prerequisite/> | ||||
|  | ||||
| @ -33,9 +33,13 @@ package com.jme3.gde.core; | ||||
| 
 | ||||
| import com.jme3.gde.core.scene.SceneApplication; | ||||
| import java.io.File; | ||||
| import java.lang.reflect.InvocationTargetException; | ||||
| import java.util.prefs.BackingStoreException; | ||||
| import javax.swing.JPopupMenu; | ||||
| import org.netbeans.upgrade.AutoUpgrade; | ||||
| import org.openide.filesystems.FileChooserBuilder; | ||||
| import org.openide.modules.ModuleInstall; | ||||
| import org.openide.util.Exceptions; | ||||
| import org.openide.util.NbBundle; | ||||
| import org.openide.util.NbPreferences; | ||||
| 
 | ||||
| @ -64,6 +68,15 @@ public class Installer extends ModuleInstall { | ||||
| 
 | ||||
|         //select project folder | ||||
|         String projectDir = NbPreferences.forModule(Installer.class).get("projects_path", null); | ||||
|         if (projectDir == null) { | ||||
|             try { | ||||
|                 AutoUpgrade.main(new String[]{}); | ||||
|                 NbPreferences.root().sync(); | ||||
|             } catch (Exception ex) { | ||||
|                 Exceptions.printStackTrace(ex); | ||||
|             } | ||||
|             projectDir = NbPreferences.forModule(Installer.class).get("projects_path", null); | ||||
|         } | ||||
|         if (projectDir == null) { | ||||
|             javax.swing.JFileChooser fr = new javax.swing.JFileChooser(); | ||||
|             javax.swing.filechooser.FileSystemView fw = fr.getFileSystemView(); | ||||
|  | ||||
| @ -325,15 +325,15 @@ public final class SceneViewerTopComponent extends TopComponent { | ||||
|     @Override | ||||
|     public void componentOpened() { | ||||
|         super.componentOpened(); | ||||
|         if(!NbPreferences.forModule(SceneViewerTopComponent.class).getBoolean("HELP_SHOWN", false)){ | ||||
|             java.awt.EventQueue.invokeLater(new Runnable() { | ||||
| 
 | ||||
|                 public void run() { | ||||
|                     Lookup.getDefault().lookup(Help.class).showHelp(new HelpCtx("com.jme3.gde.core.about")); | ||||
|                 } | ||||
|             }); | ||||
|             NbPreferences.forModule(SceneViewerTopComponent.class).put("HELP_SHOWN", "true"); | ||||
|         } | ||||
| //        if(!NbPreferences.forModule(SceneViewerTopComponent.class).getBoolean("HELP_SHOWN", false)){ | ||||
| //            java.awt.EventQueue.invokeLater(new Runnable() { | ||||
| // | ||||
| //                public void run() { | ||||
| //                    Lookup.getDefault().lookup(Help.class).showHelp(new HelpCtx("com.jme3.gde.core.about")); | ||||
| //                } | ||||
| //            }); | ||||
| //            NbPreferences.forModule(SceneViewerTopComponent.class).put("HELP_SHOWN", "true"); | ||||
| //        } | ||||
| //        oglCanvas.setActiveUpdates(true); | ||||
|     } | ||||
| 
 | ||||
|  | ||||
							
								
								
									
										96
									
								
								sdk/jmonkeyplatform.import
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										96
									
								
								sdk/jmonkeyplatform.import
									
									
									
									
									
										Normal file
									
								
							| @ -0,0 +1,96 @@ | ||||
| #org.apache.tools.ant.module OptionsExport/Advanced/AntShortcuts | ||||
| include config/(Actions/Build/.*[.]xml|(Menu|Toolbars|Shortcuts)/.*[.]shadow) | ||||
| #org.netbeans.modules.db OptionsExport/Advanced/Databases | ||||
| include config/Databases/.* | ||||
| #org.netbeans.api.debugger OptionsExport/Advanced/Debugger | ||||
| include config/Services/org-netbeans-modules-debugger-Settings\.properties | ||||
| #org.netbeans.modules.diff OptionsExport/Advanced/Diff | ||||
| include config/Services/DiffProviders/.* | ||||
| #org.netbeans.modules.favorites OptionsExport/Advanced/Favorites | ||||
| include config/Favorites/.* | ||||
| #org.netbeans.core.ui OptionsExport/Advanced/Files | ||||
| include config/Preferences/org/netbeans/core[.]properties|config/Services/MIMEResolver/.* | ||||
| #org.netbeans.modules.form OptionsExport/Advanced/Form | ||||
| include config/FormDesignerPalette/.*|config/Services/formsettings[.]settings | ||||
| #org.netbeans.modules.html OptionsExport/Advanced/HTMLPalette | ||||
| include config/HTMLPalette/.* | ||||
| #org.netbeans.modules.j2eeserver OptionsExport/Advanced/J2EE | ||||
| include config/(J2EE|GlassFish|GlassFishEE6|GlassFishEE6WC)/.* | ||||
| #org.netbeans.modules.web.core OptionsExport/Advanced/JSPPalette | ||||
| include config/JSPPalette/.* | ||||
| #org.netbeans.modules.java.platform OptionsExport/Advanced/JavaPlatform | ||||
| include config/Services/Platforms/org-netbeans-api-java-Platform/.*\.xml | ||||
| #org.netbeans.modules.maven OptionsExport/Advanced/Maven | ||||
| include config/(Preferences/org/netbeans/modules/maven([.]properties|/(?!externalOwners[.]properties).*)|Projects/org-netbeans-modules-maven/nbactions[.]xml) | ||||
| #org.netbeans.modules.project.libraries OptionsExport/Advanced/ProjectLibraries | ||||
| exclude build[.]properties#nbplatform[.]default[.]netbeans[.]dest[.]dir | ||||
| include config/org-netbeans-api-project-libraries/Libraries/.*\.xml|build[.]properties#nbplatform[.].+[.].+|var[.].* | ||||
| #org.netbeans.core.windows OptionsExport/Advanced/Toolbars | ||||
| exclude config/Toolbars/Progress/.* | ||||
| include config/Toolbars/.* | ||||
| #org.netbeans.modules.versioning.ui OptionsExport/Advanced/VersioningHistory | ||||
| include var/filehistory/.*|config/Preferences/org/netbeans/modules/versioning/ui/history[.]properties | ||||
| #org.netbeans.modules.cnd.editor OptionsExport/CND/BuildTools | ||||
| include config/Preferences/org/netbeans/modules/cnd\.properties|config/Preferences/org/netbeans/modules/cnd/toolchain\.properties | ||||
| #org.netbeans.modules.cnd.editor OptionsExport/CND/CodeAssistance | ||||
| include config/cnd-compilers/.* | ||||
| #org.netbeans.modules.cnd.editor OptionsExport/CND/Editor | ||||
| exclude config/Editors/text/x-(c|c\+\+)/Preferences/org-netbeans-modules-editor-settings-CustomPreferences.xml | ||||
| include config/Preferences/org/netbeans/modules/cnd/editor/.* | ||||
| #org.netbeans.modules.cnd.editor OptionsExport/CND/Highlighting | ||||
| include config/Preferences/org/netbeans/modules/cnd/(highlight|modelutil)\.properties | ||||
| #org.netbeans.modules.cnd.editor OptionsExport/CND/Other | ||||
| include config/Preferences/org/netbeans/modules/cnd/(utils|refactoring|callgraph|classview|qnavigator)\.properties | ||||
| #org.netbeans.modules.cnd.editor OptionsExport/CND/ProjectOptions | ||||
| include config/Preferences/org/netbeans/modules/cnd/makeproject\.properties | ||||
| #org.netbeans.modules.cnd.editor OptionsExport/CND/Remote | ||||
| include config/Preferences/org/netbeans/modules/cnd/remote\.properties | ||||
| #org.netbeans.modules.options.editor OptionsExport/Editor/CodeTemplates | ||||
| include config/Editors.*/CodeTemplates/.* | ||||
| #org.netbeans.modules.options.editor OptionsExport/Editor/General | ||||
| include config/Preferences.properties | ||||
| #org.netbeans.modules.options.editor OptionsExport/Editor/Macros | ||||
| include config/Editors/Macros/.* | ||||
| #org.netbeans.modules.options.editor OptionsExport/Editor/Other | ||||
| exclude config/Editors/.*/(macros.xml|Popup.*|Settings\.settings|.*\.instance) | ||||
| include config/Editors/(?!.*(Macros|CodeTemplates|FontsColors)).+|config/.nbattrs | ||||
| #org.netbeans.modules.options.editor OptionsExport/FontsAndColors/AnnotationsColors | ||||
| include config/Editors/AnnotationTypes/.* | ||||
| #org.netbeans.modules.options.editor OptionsExport/FontsAndColors/FontsAndColors | ||||
| include config/Editors.*/FontsColors/([^/]*)/.*|config/.nbattrs | ||||
| #org.netbeans.core.ui OptionsExport/General/General | ||||
| include config/Preferences/org/netbeans/core[.]properties|config/Services/Browsers/.* | ||||
| #org.netbeans.core.ui OptionsExport/General/Other | ||||
| include config/Preferences/.* | ||||
| #org.netbeans.modules.welcome OptionsExport/General/Welcome | ||||
| exclude config/Preferences/org/netbeans/modules/welcome[.]properties!feedback.* | ||||
| include config/Preferences/org/netbeans/modules/welcome[.]properties | ||||
| #org.netbeans.modules.options.keymap OptionsExport/Keymaps/Profiles | ||||
| include config/Keymaps/([^/]*)/.*|config/Shortcuts/.*|config/Editors/Keybindings/.*|config/.nbattrs | ||||
| #org.netbeans.modules.keyring OptionsExport/Keyring/Passwords | ||||
| include config/Preferences/org/netbeans/modules/keyring.* | ||||
| #org.netbeans.modules.php.project OptionsExport/PHP/Annotations | ||||
| include config/Preferences/org/netbeans/modules/php/project/annotations.properties | ||||
| #org.netbeans.modules.php.apigen OptionsExport/PHP/ApiGen | ||||
| include config/Preferences/org/netbeans/modules/php/apigen/apigen.properties | ||||
| #org.netbeans.modules.php.doctrine2 OptionsExport/PHP/Doctrine2 | ||||
| include config/Preferences/org/netbeans/modules/php/doctrine2/doctrine2.properties | ||||
| #org.netbeans.modules.php.project OptionsExport/PHP/General | ||||
| exclude config/Preferences/org/netbeans/modules/php/project/private(\.properties|/.*) | ||||
| include config/Preferences/org/netbeans/modules/php/project/general(\.properties|/.*)|config/Editors/text/x-php5/.* | ||||
| #org.netbeans.modules.hudson.php OptionsExport/PHP/Hudson | ||||
| include config/Preferences/org/netbeans/modules/hudson/php/hudson.properties | ||||
| #org.netbeans.modules.php.project OptionsExport/PHP/Remote | ||||
| include config/Preferences/org/netbeans/modules/php/project/RemoteConnections(\.properties|/.*) | ||||
| #org.netbeans.modules.php.smarty OptionsExport/PHP/Smarty | ||||
| include config/Preferences/org/netbeans/modules/php/smarty/smarty.properties | ||||
| #org.netbeans.modules.php.symfony OptionsExport/PHP/Symfony | ||||
| include config/Preferences/org/netbeans/modules/php/symfony/symfony.properties | ||||
| #org.netbeans.modules.php.symfony2 OptionsExport/PHP/Symfony2 | ||||
| include config/Preferences/org/netbeans/modules/php/symfony2/symfony2.properties | ||||
| #org.netbeans.modules.php.zend OptionsExport/PHP/Zend | ||||
| include config/Preferences/org/netbeans/modules/php/zend/zend.properties | ||||
| #org.netbeans.modules.favorites OptionsExport/Templates/Templates | ||||
| include config/Templates/.* | ||||
| #jme3 | ||||
| include config/Preferences/com/jme3/gde/.* | ||||
| @ -3,7 +3,7 @@ app.name=${branding.token} | ||||
| app.title=jMonkeyEngine SDK | ||||
| app.icon.icns=jmonkeyplatform.icns | ||||
| #version name used for application and settings folder, no spaces! | ||||
| app.version=3.0RC2 | ||||
| app.version=3.0RC3 | ||||
| #version number used for plugins, only 3 numbers (e.g. 3.1.3) | ||||
| plugins.version=3.0.0 | ||||
| run.args.extra=-J-Xmx512m -J-XX:PermSize=256m -J-XX:MaxDirectMemorySize=2048m | ||||
| @ -14,6 +14,7 @@ auxiliary.org-netbeans-modules-apisupport-installer.os-solaris=false | ||||
| auxiliary.org-netbeans-modules-apisupport-installer.os-windows=true | ||||
| auxiliary.org-netbeans-modules-apisupport-installer.pack200-enabled=true | ||||
| modules=\ | ||||
|     ${project.com.jme3.gde.upgrader}:\ | ||||
|     ${project.com.jme3.gde.core}:\ | ||||
|     ${project.com.jme3.gde.core.baselibs}:\ | ||||
|     ${project.com.jme3.gde.core.libraries}:\ | ||||
| @ -76,6 +77,7 @@ project.com.jme3.gde.templates=jme3-templates | ||||
| project.com.jme3.gde.terraineditor=jme3-terrain-editor | ||||
| project.com.jme3.gde.tests=jme3-tests-template | ||||
| project.com.jme3.gde.textureeditor=jme3-texture-editor | ||||
| project.com.jme3.gde.upgrader=jme3-upgrader | ||||
| project.com.jme3.gde.vehiclecreator=jme3-vehicle-creator | ||||
| project.com.jme3.gde.wavefront=jme3-wavefront | ||||
| project.com.jme3.gde.welcome=jme3-welcome-screen | ||||
|  | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user