adjuct project structure

dolphin8 · Jun 25, 2018 · e4cf251 · e4cf251
1 parent ca13737
commit e4cf251
Show file tree

Hide file tree

Showing 25 changed files with 330 additions and 364 deletions.
diff --git a/.gitignore b/.gitignore
@@ -76,11 +76,9 @@ Podfile.lock
 
 SwiftProtobuf.framework
 
-metal/paddle-mobile/Pods/
-
-
-example/paddle-mobile-demo/paddle-mobile-demo/yolo/
+metal/Pods/
 
+paddle-mobile.xcworkspace
 
 
 

diff --git a/...proj/project.xcworkspace/xcuserdata/liuruilong.xcuserdatad/UserInterfaceState.xcuserstate b/...proj/project.xcworkspace/xcuserdata/liuruilong.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/example/paddle-mobile-demo/paddle-mobile-demo/ViewController.swift b/example/paddle-mobile-demo/paddle-mobile-demo/ViewController.swift
diff --git a/metal/Podfile b/metal/Podfile
@@ -0,0 +1,14 @@
+platform :ios, ‘9.0’
+use_frameworks!
+
+workspace 'paddle-mobile.xcworkspace'
+
+target 'paddle-mobile-demo' do
+	project 'paddle-mobile-demo/paddle-mobile-demo.xcodeproj'
+    pod 'SwiftProtobuf', '~> 1.0'
+end
+
+target 'paddle-mobile' do
+	project 'paddle-mobile/paddle-mobile.xcodeproj'
+	pod 'SwiftProtobuf', '~> 1.0'
+end
diff --git a/...dle-mobile-demo.xcodeproj/project.pbxproj → ...dle-mobile-demo.xcodeproj/project.pbxproj b/...dle-mobile-demo.xcodeproj/project.pbxproj → ...dle-mobile-demo.xcodeproj/project.pbxproj
diff --git a/...ject.xcworkspace/contents.xcworkspacedata → ...ject.xcworkspace/contents.xcworkspacedata b/...ject.xcworkspace/contents.xcworkspacedata → ...ject.xcworkspace/contents.xcworkspacedata
diff --git a/...ace/xcshareddata/IDEWorkspaceChecks.plist → ...ace/xcshareddata/IDEWorkspaceChecks.plist b/...ace/xcshareddata/IDEWorkspaceChecks.plist → ...ace/xcshareddata/IDEWorkspaceChecks.plist
diff --git a/...proj/project.xcworkspace/xcuserdata/liuruilong.xcuserdatad/UserInterfaceState.xcuserstate b/...proj/project.xcworkspace/xcuserdata/liuruilong.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/...rdatad/xcschemes/xcschememanagement.plist → ...rdatad/xcschemes/xcschememanagement.plist b/...rdatad/xcschemes/xcschememanagement.plist → ...rdatad/xcschemes/xcschememanagement.plist
@@ -7,7 +7,7 @@
 		<key>paddle-mobile-demo.xcscheme</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>2</integer>
+			<integer>4</integer>
 		</dict>
 	</dict>
 </dict>

diff --git a/...demo/paddle-mobile-demo/AppDelegate.swift → ...demo/paddle-mobile-demo/AppDelegate.swift b/...demo/paddle-mobile-demo/AppDelegate.swift → ...demo/paddle-mobile-demo/AppDelegate.swift
@@ -2,7 +2,7 @@
 //  AppDelegate.swift
 //  paddle-mobile-demo
 //
-//  Created by liuRuiLong on 2018/6/20.
+//  Created by liuRuiLong on 2018/6/25.
 //  Copyright © 2018年 orange. All rights reserved.
 //
 

diff --git a/...xcassets/AppIcon.appiconset/Contents.json → ...xcassets/AppIcon.appiconset/Contents.json b/...xcassets/AppIcon.appiconset/Contents.json → ...xcassets/AppIcon.appiconset/Contents.json
diff --git a/...mobile-demo/Assets.xcassets/Contents.json → ...mobile-demo/Assets.xcassets/Contents.json b/...mobile-demo/Assets.xcassets/Contents.json → ...mobile-demo/Assets.xcassets/Contents.json
diff --git a/...e-demo/Base.lproj/LaunchScreen.storyboard → ...e-demo/Base.lproj/LaunchScreen.storyboard b/...e-demo/Base.lproj/LaunchScreen.storyboard → ...e-demo/Base.lproj/LaunchScreen.storyboard
diff --git a/...le-mobile-demo/Base.lproj/Main.storyboard → ...le-mobile-demo/Base.lproj/Main.storyboard b/...le-mobile-demo/Base.lproj/Main.storyboard → ...le-mobile-demo/Base.lproj/Main.storyboard
diff --git a/...mobile-demo/paddle-mobile-demo/Info.plist → ...mobile-demo/paddle-mobile-demo/Info.plist b/...mobile-demo/paddle-mobile-demo/Info.plist → ...mobile-demo/paddle-mobile-demo/Info.plist
diff --git a/metal/paddle-mobile-demo/paddle-mobile-demo/ViewController.swift b/metal/paddle-mobile-demo/paddle-mobile-demo/ViewController.swift
@@ -0,0 +1,27 @@
+//
+//  ViewController.swift
+//  paddle-mobile-demo
+//
+//  Created by liuRuiLong on 2018/6/25.
+//  Copyright © 2018年 orange. All rights reserved.
+//
+
+
+import UIKit
+import paddle_mobile
+
+class ViewController: UIViewController {
+
+    override func viewDidLoad() {
+        super.viewDidLoad()
+
+    }
+
+    override func didReceiveMemoryWarning() {
+        super.didReceiveMemoryWarning()
+        // Dispose of any resources that can be recreated.
+    }
+
+
+}
+
diff --git a/...ile-demo/paddle-mobile-demo/test.pb.swift → ...ile-demo/paddle-mobile-demo/test.pb.swift b/...ile-demo/paddle-mobile-demo/test.pb.swift → ...ile-demo/paddle-mobile-demo/test.pb.swift
diff --git a/metal/paddle-mobile/Podfile b/metal/paddle-mobile/Podfile
diff --git a/metal/paddle-mobile/paddle-mobile.xcodeproj/project.pbxproj b/metal/paddle-mobile/paddle-mobile.xcodeproj/project.pbxproj
diff --git a/...proj/project.xcworkspace/xcuserdata/liuruilong.xcuserdatad/UserInterfaceState.xcuserstate b/...proj/project.xcworkspace/xcuserdata/liuruilong.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/metal/paddle-mobile/paddle-mobile.xcworkspace/contents.xcworkspacedata b/metal/paddle-mobile/paddle-mobile.xcworkspace/contents.xcworkspacedata
diff --git a/metal/paddle-mobile/paddle-mobile.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/metal/paddle-mobile/paddle-mobile.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
diff --git a/...addle-mobile.xcworkspace/xcuserdata/liuruilong.xcuserdatad/UserInterfaceState.xcuserstate b/...addle-mobile.xcworkspace/xcuserdata/liuruilong.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/...mobile.xcworkspace/xcuserdata/liuruilong.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/...mobile.xcworkspace/xcuserdata/liuruilong.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
diff --git a/metal/paddle-mobile/paddle-mobile/paddle_mobile.h b/metal/paddle-mobile/paddle-mobile/paddle_mobile.h
@@ -1,16 +1,10 @@
-/* Copyright (c) 2018 PaddlePaddle Authors. All Rights Reserved.
- 
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
- 
- http://www.apache.org/licenses/LICENSE-2.0
- 
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License. */
+//
+//  paddle_mobile.h
+//  paddle-mobile
+//
+//  Created by liuRuiLong on 2018/6/25.
+//  Copyright © 2018年 orange. All rights reserved.
+//
 
 #import <UIKit/UIKit.h>