|
 |
a13090d |
From f51140b80a0925d2d69b15030a7f8d54c2276832 Mon Sep 17 00:00:00 2001
|
|
|
aa5728f |
From: Lubomir Rintel <lkundrak@v3.sk>
|
|
|
aa5728f |
Date: Wed, 24 Dec 2014 09:53:49 +0100
|
|
|
aa5728f |
Subject: [PATCH] Try to run freerouting by its JPackage launcher script
|
|
|
aa5728f |
|
|
|
aa5728f |
It's a sin to touch the Java tool by its JAR file in Fedora.
|
|
|
aa5728f |
---
|
|
|
d737581 |
pcbnew/dialogs/dialog_freeroute_exchange.cpp | 23 ++++++++++++++++++++---
|
|
|
d737581 |
1 file changed, 20 insertions(+), 3 deletions(-)
|
|
|
aa5728f |
|
|
|
d737581 |
diff --git a/pcbnew/dialogs/dialog_freeroute_exchange.cpp b/pcbnew/dialogs/dialog_freeroute_exchange.cpp
|
|
|
a13090d |
index 7b057f6..4207d4e 100644
|
|
|
d737581 |
--- a/pcbnew/dialogs/dialog_freeroute_exchange.cpp
|
|
|
d737581 |
+++ b/pcbnew/dialogs/dialog_freeroute_exchange.cpp
|
|
|
d737581 |
@@ -71,7 +71,10 @@ void DIALOG_FREEROUTE::MyInit()
|
|
|
db4dcf9 |
SetFocus();
|
|
|
db4dcf9 |
m_freeRouterFound = false;
|
|
|
db4dcf9 |
|
|
|
db4dcf9 |
- wxFileName fileName( FindKicadFile( wxT( "freeroute.jar" ) ), wxPATH_UNIX );
|
|
|
db4dcf9 |
+ wxFileName fileName( FindKicadFile( wxT( "freerouting" ) ), wxPATH_UNIX );
|
|
|
db4dcf9 |
+
|
|
|
db4dcf9 |
+ if( !fileName.FileExists() )
|
|
|
db4dcf9 |
+ fileName.Assign ( FindKicadFile( wxT( "freeroute.jar" ) ), wxPATH_UNIX );
|
|
|
db4dcf9 |
|
|
|
db4dcf9 |
if( fileName.FileExists() )
|
|
|
db4dcf9 |
m_freeRouterFound = true;
|
|
|
d737581 |
@@ -126,8 +129,22 @@ void DIALOG_FREEROUTE::OnLaunchButtonClick( wxCommandEvent& event )
|
|
|
db4dcf9 |
return;
|
|
|
db4dcf9 |
}
|
|
|
db4dcf9 |
|
|
|
db4dcf9 |
- wxFileName jarfileName( FindKicadFile( wxT( "freeroute.jar" ) ), wxPATH_UNIX );
|
|
|
db4dcf9 |
- wxString command;
|
|
|
db4dcf9 |
+ wxFileName jarfileName( FindKicadFile( wxT( "freerouting" ) ), wxPATH_UNIX );
|
|
|
db4dcf9 |
+ wxString command = wxT( "" );
|
|
|
db4dcf9 |
+
|
|
|
db4dcf9 |
+ if( jarfileName.FileExists() )
|
|
|
db4dcf9 |
+ {
|
|
|
db4dcf9 |
+ command << wxChar( '"' ) << jarfileName.GetFullPath() << wxChar( '"' );
|
|
|
db4dcf9 |
+ // add option to load the .dsn file
|
|
|
db4dcf9 |
+ command << wxT( " -de " );
|
|
|
db4dcf9 |
+ // add *.dsn full filename (quoted):
|
|
|
db4dcf9 |
+ command << wxChar( '"' ) << dsnFile << wxChar( '"' );
|
|
|
db4dcf9 |
+
|
|
|
db4dcf9 |
+ ProcessExecute( command );
|
|
|
db4dcf9 |
+ return;
|
|
|
db4dcf9 |
+ } else {
|
|
|
db4dcf9 |
+ jarfileName.Assign ( FindKicadFile( wxT( "freeroute.jar" ) ), wxPATH_UNIX );
|
|
|
db4dcf9 |
+ }
|
|
|
db4dcf9 |
|
|
|
db4dcf9 |
// Find the Java application on Windows.
|
|
|
db4dcf9 |
// Colud be no more needed since we now have to run only java, not java web start
|
|
|
d737581 |
--
|
|
|
a13090d |
2.5.0
|
|
|
d737581 |
|