修改部分Linux快速安装脚本的bug

examples/VnTrader/run.py

@@ -5,6 +5,10 @@ import sys
 reload(sys)
 sys.setdefaultencoding('utf8')
 
+# 判断操作系统
+import platform
+system = platform.system()
+
 # vn.trader模块
 from vnpy.event import EventEngine
 from vnpy.trader.vtEngine import MainEngine
@@ -12,9 +16,12 @@ from vnpy.trader.uiQt import qApp
 from vnpy.trader.uiMainWindow import MainWindow
 
 # 加载底层接口
-from vnpy.trader.gateway import (ctpGateway, femasGateway, xspeedGateway, 
-                                 sgitGateway, oandaGateway, ibGateway, 
-                                 shzdGateway, huobiGateway, okcoinGateway)
+from vnpy.trader.gateway import (ctpGateway, oandaGateway, ibGateway, 
+                                 huobiGateway, okcoinGateway)
+
+if system == 'Windows':
+    from vnpy.trader.gateway import (femasGateway, xspeedGateway, 
+                                     sgitGateway, shzdGateway)
 
 # 加载上层应用
 from vnpy.trader.app import (riskManager, ctaStrategy, spreadTrading)
@@ -31,14 +38,16 @@ def main():
     
     # 添加交易接口
     me.addGateway(ctpGateway)
+    me.addGateway(oandaGateway)
+    me.addGateway(ibGateway)
+    me.addGateway(huobiGateway)
+    me.addGateway(okcoinGateway)
+    
+    if system == 'Windows':
         me.addGateway(femasGateway)
         me.addGateway(xspeedGateway)
         me.addGateway(sgitGateway)  
-    me.addGateway(oandaGateway)
-    me.addGateway(ibGateway)
         me.addGateway(shzdGateway)
-    me.addGateway(huobiGateway)
-    me.addGateway(okcoinGateway)
         
     # 添加上层应用
     me.addApp(riskManager)

vnpy/api/ctp/build.sh

@@ -12,6 +12,6 @@ cmake ..
 make VERBOSE=1 -j 1
 ln -fs `pwd`/lib/vnctpmd.so ../vnctpmd/test/vnctpmd.so
 ln -fs `pwd`/lib/vnctptd.so ../vnctptd/test/vnctptd.so
-cp ../vnctpmd/test/vnctpmd.* ./
-cp ../vnctptd/test/vnctptd.* ./
+cp ../vnctpmd/test/vnctpmd.* ../
+cp ../vnctptd/test/vnctptd.* ../
 popd

vnpy/api/ib/build.sh

@@ -15,4 +15,5 @@ popd
 pushd $BUILDDIR
 cmake ..
 make VERBOSE=1 -j 1
+cp ./lib/vnib.* ../
 popd

vnpy/api/lts/build.sh

@@ -13,7 +13,7 @@ make VERBOSE=1 -j 1
 ln -fs `pwd`/lib/vnltsmd.so ../vnltsmd/test/vnltsmd.so
 ln -fs `pwd`/lib/vnltstd.so ../vnltstd/test/vnltstd.so
 ln -fs `pwd`/lib/vnltsqry.so ../vnltsqry/test/vnltsqry.so
-cp ../vnltsmd/test/vnltsmd.* ./
-cp ../vnltstd/test/vnltstd.* ./
-cp ../vnltsqry/test/vnltsqry.* ./
+cp ../vnltsmd/test/vnltsmd.* ../
+cp ../vnltstd/test/vnltstd.* ../
+cp ../vnltsqry/test/vnltsqry.* ../
 popd