• R/O
  • SSH
  • HTTPS

cabos: Commit


Commit MetaInfo

Revisión84 (tree)
Tiempo2010-02-01 20:13:02
Autorheavy_baby

Log Message

java binary path

Cambiar Resumen

Diferencia incremental

--- trunk/Cabos/Cabos.xml (revision 83)
+++ trunk/Cabos/Cabos.xml (revision 84)
@@ -84,7 +84,7 @@
8484 <BuildWinName>Cabos.exe</BuildWinName> <BuildWinMDI>0</BuildWinMDI> <BuildLinuxX86Name>MyApplication</BuildLinuxX86Name> - <EditBounds><Rect left="121" top="64" width="239" height="411"/></EditBounds> + <EditBounds><Rect left="149" top="119" width="239" height="411"/></EditBounds> <FileType> <ItemName>application/executable</ItemName> <MacCreator>????</MacCreator> @@ -102,12 +102,12 @@
8585 <block type="Module" ID="-1116423273"> <ObjName>CCoreController</ObjName> <ObjContainerID>-1007788628</ObjContainerID> - <EditBounds><Rect left="187" top="52" width="980" height="679"/></EditBounds> + <EditBounds><Rect left="89" top="54" width="980" height="679"/></EditBounds> <EditSplit>206</EditSplit> <BrowserPositionGroup> <BrowserPositionElement> <ScreenKey>100001108</ScreenKey> - <EditBounds><Rect left="187" top="52" width="980" height="679"/></EditBounds> + <EditBounds><Rect left="89" top="54" width="980" height="679"/></EditBounds> <EditSplit>206</EditSplit> </BrowserPositionElement> <BrowserPositionElement> @@ -227,10 +227,10 @@
8686 <ItemResult></ItemResult> <ItemFlags>0</ItemFlags> <ItemSource> - <StartSelRow>172</StartSelRow> - <StartSelCol>0</StartSelCol> - <EndSelRow>172</EndSelRow> - <EndSelCol>4</EndSelCol> + <StartSelRow>133</StartSelRow> + <StartSelCol>17</StartSelCol> + <EndSelRow>133</EndSelRow> + <EndSelCol>17</EndSelCol> <TextEncoding>134217984</TextEncoding> <SourceLine>Sub Initialize(network as CNetworkController, query as CQueryController, downloads as CDownloadsController, uploads as CUploadsController, fileurns as CFileurnsController, filter as CFilterController)</SourceLine> <SourceLine></SourceLine> @@ -320,6 +320,7 @@
8787 <SourceLine>#elseif targetWin32</SourceLine> <SourceLine>dim bs as binaryStream</SourceLine> <SourceLine>dim f as folderItem</SourceLine> + <SourceLine>dim javaBinaryPath as string</SourceLine> <SourceLine></SourceLine> <SourceLine>try</SourceLine> <SourceLine>if App.ExecutableFile.fixRbBug.parent.child("Contents").child("Resources").child("Java").child("CabosCore.jar").exists then</SourceLine> @@ -326,10 +327,11 @@
8888 <SourceLine></SourceLine> <SourceLine>if targetNT then</SourceLine> <SourceLine>javaBundlePath = App.ExecutableFile.fixRbBug.parent.child("Contents").child("Resources").child("Java").posixPath</SourceLine> + <SourceLine>javaBinaryPath = SystemFolder.child("java.exe").posixPath</SourceLine> <SourceLine>me.execute _</SourceLine> <SourceLine>javaBundlePath.left(2) + "&amp;" + _</SourceLine> <SourceLine>"cd """ + javaBundlePath + """&amp;" + _</SourceLine> - <SourceLine>"java " + _</SourceLine> + <SourceLine>javaBinaryPath + " " + _</SourceLine> <SourceLine>"-Dfile.encoding=UTF-8 " + _</SourceLine> <SourceLine>"-Djava.library.path=. " + _</SourceLine> <SourceLine>"-Djava.net.preferIPv4Stack=true " + _</SourceLine> @@ -355,6 +357,7 @@
8989 <SourceLine></SourceLine> <SourceLine>else</SourceLine> <SourceLine>javaBundlePath = App.ExecutableFile.fixRbBug.parent.child("Contents").child("Resources").child("Java").posixPath</SourceLine> + <SourceLine>javaBinaryPath = SystemFolder.child("java.exe").posixPath</SourceLine> <SourceLine>f = PreferencesFolder.fixRbBug.child("CabosCore.bat")</SourceLine> <SourceLine></SourceLine> <SourceLine>try</SourceLine> @@ -362,7 +365,7 @@
9090 <SourceLine>bs.write convertEncoding( _</SourceLine> <SourceLine>javaBundlePath.left(2) + EndOfLine.Windows + _</SourceLine> <SourceLine>"cd """ + javaBundlePath + """" + EndOfLine.Windows + _</SourceLine> - <SourceLine>"java " + _</SourceLine> + <SourceLine>javaBinaryPath + " " + _</SourceLine> <SourceLine>"-Dfile.encoding=UTF-8 " + _</SourceLine> <SourceLine>"-Djava.library.path=. " + _</SourceLine> <SourceLine>"-Djava.net.preferIPv4Stack=true " + _</SourceLine> @@ -24506,7 +24509,7 @@
9191 <Property Flags="33">lastSearch As string</Property> <Method> <TextEncoding>134217984</TextEncoding> - <ItemName>plist</ItemName> + <ItemName>Constructor</ItemName> <ItemParams>f As FolderItem</ItemParams> <ItemResult></ItemResult> <ItemFlags>0</ItemFlags> @@ -24516,7 +24519,7 @@
9292 <EndSelRow>1</EndSelRow> <EndSelCol>7</EndSelCol> <TextEncoding>134217984</TextEncoding> - <SourceLine>Sub plist(f As FolderItem)</SourceLine> + <SourceLine>Sub Constructor(f As FolderItem)</SourceLine> <SourceLine>Load(f)</SourceLine> <SourceLine>End Sub</SourceLine> </ItemSource> @@ -25519,7 +25522,7 @@
9393 </Method> <Method> <TextEncoding>134217984</TextEncoding> - <ItemName>plistDict</ItemName> + <ItemName>Constructor</ItemName> <ItemParams></ItemParams> <ItemResult></ItemResult> <ItemFlags>0</ItemFlags> @@ -25529,7 +25532,7 @@
9494 <EndSelRow>1</EndSelRow> <EndSelCol>0</EndSelCol> <TextEncoding>134217984</TextEncoding> - <SourceLine>Sub plistDict()</SourceLine> + <SourceLine>Sub Constructor()</SourceLine> <SourceLine>values=new dictionary</SourceLine> <SourceLine>types=new dictionary</SourceLine> <SourceLine>searched=new Dictionary</SourceLine> @@ -28823,10 +28826,10 @@
9595 <ItemResult>Boolean</ItemResult> <ItemFlags>0</ItemFlags> <ItemSource> - <StartSelRow>3</StartSelRow> + <StartSelRow>5</StartSelRow> <StartSelCol>0</StartSelCol> - <EndSelRow>3</EndSelRow> - <EndSelCol>7</EndSelCol> + <EndSelRow>5</EndSelRow> + <EndSelCol>0</EndSelCol> <TextEncoding>134217984</TextEncoding> <SourceLine>Function targetNT() As Boolean</SourceLine> <SourceLine></SourceLine> @@ -28934,10 +28937,10 @@
9696 <ItemResult>integer</ItemResult> <ItemFlags>0</ItemFlags> <ItemSource> - <StartSelRow>3</StartSelRow> - <StartSelCol>0</StartSelCol> - <EndSelRow>3</EndSelRow> - <EndSelCol>7</EndSelCol> + <StartSelRow>4</StartSelRow> + <StartSelCol>17</StartSelCol> + <EndSelRow>4</EndSelRow> + <EndSelCol>17</EndSelCol> <TextEncoding>134217984</TextEncoding> <SourceLine>Function getMenuHandle(hWnd as integer) As integer</SourceLine> <SourceLine></SourceLine> @@ -28957,10 +28960,10 @@
9797 <ItemResult>integer</ItemResult> <ItemFlags>0</ItemFlags> <ItemSource> - <StartSelRow>3</StartSelRow> - <StartSelCol>0</StartSelCol> - <EndSelRow>3</EndSelRow> - <EndSelCol>7</EndSelCol> + <StartSelRow>6</StartSelRow> + <StartSelCol>6</StartSelCol> + <EndSelRow>6</EndSelRow> + <EndSelCol>6</EndSelCol> <TextEncoding>134217984</TextEncoding> <SourceLine>Function getSubMenuHandle(hMenu as integer, nPos as integer) As integer</SourceLine> <SourceLine></SourceLine> @@ -28980,16 +28983,17 @@
9898 <ItemResult></ItemResult> <ItemFlags>0</ItemFlags> <ItemSource> - <StartSelRow>21</StartSelRow> + <StartSelRow>29</StartSelRow> <StartSelCol>0</StartSelCol> - <EndSelRow>21</EndSelRow> - <EndSelCol>7</EndSelCol> + <EndSelRow>29</EndSelRow> + <EndSelCol>0</EndSelCol> <TextEncoding>134217984</TextEncoding> <SourceLine>Sub localizeSubMenus(hMenu as integer, m as menuItem)</SourceLine> <SourceLine></SourceLine> - <SourceLine>#if targetMachO</SourceLine> <SourceLine>dim i, j as integer</SourceLine> <SourceLine></SourceLine> + <SourceLine>#if targetMachO</SourceLine> + <SourceLine></SourceLine> <SourceLine>j = m.count - 1</SourceLine> <SourceLine></SourceLine> <SourceLine>for i = 0 to j</SourceLine> @@ -29013,7 +29017,6 @@
9999 <SourceLine>Const MF_HELP = &amp;H4000</SourceLine> <SourceLine></SourceLine> <SourceLine>dim lpString as new MemoryBlock(255)</SourceLine> - <SourceLine>dim i, j as integer</SourceLine> <SourceLine></SourceLine> <SourceLine>//* fix rb bug *//</SourceLine> <SourceLine></SourceLine> @@ -29058,10 +29061,10 @@
100100 <ItemResult></ItemResult> <ItemFlags>0</ItemFlags> <ItemSource> - <StartSelRow>3</StartSelRow> - <StartSelCol>0</StartSelCol> - <EndSelRow>3</EndSelRow> - <EndSelCol>7</EndSelCol> + <StartSelRow>4</StartSelRow> + <StartSelCol>15</StartSelCol> + <EndSelRow>4</EndSelRow> + <EndSelCol>15</EndSelCol> <TextEncoding>134217984</TextEncoding> <SourceLine>Sub drawMenuItems(hWnd as integer)</SourceLine> <SourceLine></SourceLine> Index: trunk/Cabos/Cabos.rb
101101===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Show on old repository browser