Skip to content

Commit 255b849

Browse files
cynthiajoancynthiajoan
authored
Merge pull request #135 from firebase/fix-firestore
Add pdb files into the package
2 parents acc13e4 + dac5aa4 commit 255b849

File tree

3 files changed

+49
-48
lines changed

3 files changed

+49
-48
lines changed

‎build_package.py

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -102,19 +102,19 @@ def find_pack_script():
102102
built_folder_ext = "_unity"
103103
built_folder_postion = os.path.join("external", "src", "google_unity_jar_resolver")
104104
built_folder = None
105-
resolver_root_folder = None
105+
resolver_root_folder = "unity-jar-resolver"
106106
for folder in os.listdir("."):
107107
if folder.endswith(built_folder_ext):
108108
built_folder = folder
109109
break
110+
110111
if built_folder != None:
111112
resolver_root_folder = os.path.join(built_folder, built_folder_postion)
112-
else:
113+
elif not os.path.exists(resolver_root_folder):
113114
git_clone_script = ["git", "clone",
114115
"--depth", "1",
115116
"https://github.com/googlesamples/unity-jar-resolver.git"]
116117
subprocess.call(git_clone_script)
117-
resolver_root_folder = "unity-jar-resolver"
118118

119119
if resolver_root_folder != None:
120120
script_path = os.path.join(resolver_root_folder, "source", "ExportUnityPackage", "export_unity_package.py")
@@ -138,7 +138,6 @@ def main(argv):
138138
last_version = get_last_version()
139139

140140
zip_file_list = get_zip_files()
141-
142141
if not zip_file_list:
143142
raise app.UsageError("No zip files to process.")
144143

@@ -171,10 +170,9 @@ def main(argv):
171170
output, error = p.communicate()
172171
if p.returncode != 0:
173172
error_str = str(error)
174-
split_string = error_str.split("assets:")[-1]
175-
split_string = split_string.rstrip("\\n\'")
176-
print(split_string)
177-
split_string = split_string.split(" ")
173+
error_str = error_str.split("assets:")[-1]
174+
error_str = error_str.rstrip("\\n\'")
175+
split_string = error_str.split(" ")
178176
split_string = split_string[3:] # exclude first 3 lines
179177
gen_guids_script_path = os.path.join(os.getcwd(), "gen_guids.py")
180178
gen_cmd_args = [
@@ -191,7 +189,11 @@ def main(argv):
191189
subprocess.call(gen_cmd_args)
192190

193191
# Need to package again if has that error
194-
subprocess.call(cmd_args)
192+
subprocess.call(cmd_args)
193+
else:
194+
error_list = str(error).split("\\n")
195+
logging.info("\n".join(error_list))
196+
logging.info("Packaging done for version %s", last_version)
195197

196198
if __name__ == '__main__':
197199
app.run(main)

‎unity_packer/exports.json

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
"cpu": "AnyCPU",
6666
"paths": [
6767
"Firebase/Plugins/Firebase.Platform.dll",
68-
"Firebase/Plugins/Firebase.Platform.dll.mdb",
68+
"Firebase/Plugins/Firebase.Platform.pdb",
6969
"Firebase/Plugins/Google.MiniJson.dll"
7070
]
7171
},
@@ -75,7 +75,7 @@
7575
"cpu": "AnyCPU",
7676
"paths": [
7777
"Firebase/Plugins/Firebase.App.dll",
78-
"Firebase/Plugins/Firebase.App.dll.mdb"
78+
"Firebase/Plugins/Firebase.App.pdb"
7979
]
8080
},
8181
{
@@ -85,7 +85,7 @@
8585
"paths": [
8686
"Plugins/iOS/Firebase/libFirebaseCppApp.a",
8787
"Firebase/Plugins/iOS/Firebase.App.dll",
88-
"Firebase/Plugins/iOS/Firebase.App.dll.mdb"
88+
"Firebase/Plugins/iOS/Firebase.App.pdb"
8989
]
9090
},
9191
{
@@ -94,7 +94,7 @@
9494
"labels": ["gvh_targets-editor"],
9595
"paths": [
9696
"Firebase/Editor/Firebase.Editor.dll",
97-
"Firebase/Editor/Firebase.Editor.dll.mdb"
97+
"Firebase/Editor/Firebase.Editor.pdb"
9898
],
9999
"override_metadata_upm": {
100100
"PluginImporter": {
@@ -112,7 +112,7 @@
112112
"cpu": "AnyCPU",
113113
"paths": [
114114
"Firebase/Plugins/Firebase.TaskExtension.dll",
115-
"Firebase/Plugins/Firebase.TaskExtension.dll.mdb"
115+
"Firebase/Plugins/Firebase.TaskExtension.pdb"
116116
]
117117
},
118118
{
@@ -187,7 +187,7 @@
187187
"manifest" : {
188188
"unity": "2017.1",
189189
"dependencies": {
190-
"com.google.external-dependency-manager" : "1.2.168"
190+
"com.google.external-dependency-manager" : "1.2.167"
191191
}
192192
}
193193
}
@@ -218,7 +218,7 @@
218218
"cpu": "AnyCPU",
219219
"paths": [
220220
"Firebase/Plugins/Firebase.Analytics.dll",
221-
"Firebase/Plugins/Firebase.Analytics.dll.mdb"
221+
"Firebase/Plugins/Firebase.Analytics.pdb"
222222
]
223223
},
224224
{
@@ -228,7 +228,7 @@
228228
"paths": [
229229
"Plugins/iOS/Firebase/libFirebaseCppAnalytics.a",
230230
"Firebase/Plugins/iOS/Firebase.Analytics.dll",
231-
"Firebase/Plugins/iOS/Firebase.Analytics.dll.mdb"
231+
"Firebase/Plugins/iOS/Firebase.Analytics.pdb"
232232
]
233233
},
234234
{
@@ -309,7 +309,7 @@
309309
"cpu": "AnyCPU",
310310
"paths": [
311311
"Firebase/Plugins/Firebase.Auth.dll",
312-
"Firebase/Plugins/Firebase.Auth.dll.mdb"
312+
"Firebase/Plugins/Firebase.Auth.pdb"
313313
]
314314
},
315315
{
@@ -319,7 +319,7 @@
319319
"paths": [
320320
"Plugins/iOS/Firebase/libFirebaseCppAuth.a",
321321
"Firebase/Plugins/iOS/Firebase.Auth.dll",
322-
"Firebase/Plugins/iOS/Firebase.Auth.dll.mdb"
322+
"Firebase/Plugins/iOS/Firebase.Auth.pdb"
323323
]
324324
},
325325
{
@@ -398,7 +398,7 @@
398398
"cpu": "AnyCPU",
399399
"paths": [
400400
"Firebase/Plugins/Firebase.Crashlytics.dll",
401-
"Firebase/Plugins/Firebase.Crashlytics.dll.mdb"
401+
"Firebase/Plugins/Firebase.Crashlytics.pdb"
402402
]
403403
},
404404
{
@@ -409,7 +409,7 @@
409409
"Plugins/iOS/Firebase/libCrashlyticsiOSWrapper.a",
410410
"Plugins/iOS/Firebase/libFirebaseCppCrashlytics.a",
411411
"Firebase/Plugins/iOS/Firebase.Crashlytics.dll",
412-
"Firebase/Plugins/iOS/Firebase.Crashlytics.dll.mdb"
412+
"Firebase/Plugins/iOS/Firebase.Crashlytics.pdb"
413413
]
414414
},
415415
{
@@ -418,7 +418,7 @@
418418
"labels": ["gvh_targets-editor"],
419419
"paths": [
420420
"Firebase/Editor/Firebase.Crashlytics.Editor.dll",
421-
"Firebase/Editor/Firebase.Crashlytics.Editor.dll.mdb"
421+
"Firebase/Editor/Firebase.Crashlytics.Editor.pdb"
422422
],
423423
"override_metadata_upm": {
424424
"PluginImporter": {
@@ -498,7 +498,7 @@
498498
"cpu": "AnyCPU",
499499
"paths": [
500500
"Firebase/Plugins/Firebase.DynamicLinks.dll",
501-
"Firebase/Plugins/Firebase.DynamicLinks.dll.mdb"
501+
"Firebase/Plugins/Firebase.DynamicLinks.pdb"
502502
]
503503
},
504504
{
@@ -508,7 +508,7 @@
508508
"paths": [
509509
"Plugins/iOS/Firebase/libFirebaseCppDynamicLinks.a",
510510
"Firebase/Plugins/iOS/Firebase.DynamicLinks.dll",
511-
"Firebase/Plugins/iOS/Firebase.DynamicLinks.dll.mdb"
511+
"Firebase/Plugins/iOS/Firebase.DynamicLinks.pdb"
512512
]
513513
},
514514
{
@@ -583,7 +583,7 @@
583583
"cpu": "AnyCPU",
584584
"paths": [
585585
"Firebase/Plugins/Firebase.RemoteConfig.dll",
586-
"Firebase/Plugins/Firebase.RemoteConfig.dll.mdb"
586+
"Firebase/Plugins/Firebase.RemoteConfig.pdb"
587587
]
588588
},
589589
{
@@ -593,7 +593,7 @@
593593
"paths": [
594594
"Plugins/iOS/Firebase/libFirebaseCppRemoteConfig.a",
595595
"Firebase/Plugins/iOS/Firebase.RemoteConfig.dll",
596-
"Firebase/Plugins/iOS/Firebase.RemoteConfig.dll.mdb"
596+
"Firebase/Plugins/iOS/Firebase.RemoteConfig.pdb"
597597
]
598598
},
599599
{
@@ -671,7 +671,7 @@
671671
"cpu": "AnyCPU",
672672
"paths": [
673673
"Firebase/Plugins/Firebase.Messaging.dll",
674-
"Firebase/Plugins/Firebase.Messaging.dll.mdb"
674+
"Firebase/Plugins/Firebase.Messaging.pdb"
675675
]
676676
},
677677
{
@@ -681,7 +681,7 @@
681681
"paths": [
682682
"Plugins/iOS/Firebase/libFirebaseCppMessaging.a",
683683
"Firebase/Plugins/iOS/Firebase.Messaging.dll",
684-
"Firebase/Plugins/iOS/Firebase.Messaging.dll.mdb"
684+
"Firebase/Plugins/iOS/Firebase.Messaging.pdb"
685685
]
686686
},
687687
{
@@ -690,7 +690,7 @@
690690
"labels": ["gvh_targets-editor"],
691691
"paths": [
692692
"Firebase/Editor/Firebase.Messaging.Editor.dll",
693-
"Firebase/Editor/Firebase.Messaging.Editor.dll.mdb"
693+
"Firebase/Editor/Firebase.Messaging.Editor.pdb"
694694
],
695695
"override_metadata_upm": {
696696
"PluginImporter": {
@@ -779,7 +779,7 @@
779779
"cpu": "AnyCPU",
780780
"paths": [
781781
"Firebase/Plugins/Firebase.Database.dll",
782-
"Firebase/Plugins/Firebase.Database.dll.mdb"
782+
"Firebase/Plugins/Firebase.Database.pdb"
783783
]
784784
},
785785
{
@@ -789,7 +789,7 @@
789789
"paths": [
790790
"Plugins/iOS/Firebase/libFirebaseCppDatabase.a",
791791
"Firebase/Plugins/iOS/Firebase.Database.dll",
792-
"Firebase/Plugins/iOS/Firebase.Database.dll.mdb"
792+
"Firebase/Plugins/iOS/Firebase.Database.pdb"
793793
]
794794
},
795795
{
@@ -878,7 +878,7 @@
878878
"cpu": "AnyCPU",
879879
"paths": [
880880
"Firebase/Plugins/Firebase.Functions.dll",
881-
"Firebase/Plugins/Firebase.Functions.dll.mdb"
881+
"Firebase/Plugins/Firebase.Functions.pdb"
882882
]
883883
},
884884
{
@@ -888,7 +888,7 @@
888888
"paths": [
889889
"Plugins/iOS/Firebase/libFirebaseCppFunctions.a",
890890
"Firebase/Plugins/iOS/Firebase.Functions.dll",
891-
"Firebase/Plugins/iOS/Firebase.Functions.dll.mdb"
891+
"Firebase/Plugins/iOS/Firebase.Functions.pdb"
892892
]
893893
},
894894
{
@@ -964,7 +964,7 @@
964964
"cpu": "AnyCPU",
965965
"paths": [
966966
"Firebase/Plugins/Firebase.Storage.dll",
967-
"Firebase/Plugins/Firebase.Storage.dll.mdb"
967+
"Firebase/Plugins/Firebase.Storage.pdb"
968968
]
969969
},
970970
{
@@ -974,7 +974,7 @@
974974
"paths": [
975975
"Plugins/iOS/Firebase/libFirebaseCppStorage.a",
976976
"Firebase/Plugins/iOS/Firebase.Storage.dll",
977-
"Firebase/Plugins/iOS/Firebase.Storage.dll.mdb"
977+
"Firebase/Plugins/iOS/Firebase.Storage.pdb"
978978
]
979979
},
980980
{
@@ -983,7 +983,7 @@
983983
"cpu": "AnyCPU",
984984
"paths": [
985985
"Firebase/Plugins/Google.Sharpen.dll",
986-
"Firebase/Plugins/Google.Sharpen.dll.mdb"
986+
"Firebase/Plugins/Google.Sharpen.pdb"
987987
]
988988
},
989989
{
@@ -1063,7 +1063,7 @@
10631063
"cpu": "AnyCPU",
10641064
"paths": [
10651065
"Firebase/Plugins/Firebase.Installations.dll",
1066-
"Firebase/Plugins/Firebase.Installations.dll.mdb"
1066+
"Firebase/Plugins/Firebase.Installations.pdb"
10671067
]
10681068
},
10691069
{
@@ -1073,7 +1073,7 @@
10731073
"paths": [
10741074
"Plugins/iOS/Firebase/libFirebaseCppInstallations.a",
10751075
"Firebase/Plugins/iOS/Firebase.Installations.dll",
1076-
"Firebase/Plugins/iOS/Firebase.Installations.dll.mdb"
1076+
"Firebase/Plugins/iOS/Firebase.Installations.pdb"
10771077
]
10781078
},
10791079
{
@@ -1151,7 +1151,7 @@
11511151
"cpu": "AnyCPU",
11521152
"paths": [
11531153
"Firebase/Plugins/Firebase.Performance.dll",
1154-
"Firebase/Plugins/Firebase.Performance.dll.mdb"
1154+
"Firebase/Plugins/Firebase.Performance.pdb"
11551155
]
11561156
},
11571157
{
@@ -1161,7 +1161,7 @@
11611161
"paths": [
11621162
"Plugins/iOS/Firebase/libFirebaseCppPerformance.a",
11631163
"Firebase/Plugins/iOS/Firebase.Performance.dll",
1164-
"Firebase/Plugins/iOS/Firebase.Performance.dll.mdb"
1164+
"Firebase/Plugins/iOS/Firebase.Performance.pdb"
11651165
]
11661166
},
11671167
{
@@ -1238,7 +1238,7 @@
12381238
"cpu": "AnyCPU",
12391239
"paths": [
12401240
"Firebase/Plugins/Firebase.Firestore.dll",
1241-
"Firebase/Plugins/Firebase.Firestore.dll.mdb"
1241+
"Firebase/Plugins/Firebase.Firestore.pdb"
12421242
]
12431243
},
12441244
{
@@ -1248,7 +1248,7 @@
12481248
"paths": [
12491249
"Plugins/iOS/Firebase/libFirebaseCppFirestore.a",
12501250
"Firebase/Plugins/iOS/Firebase.Firestore.dll",
1251-
"Firebase/Plugins/iOS/Firebase.Firestore.dll.mdb"
1251+
"Firebase/Plugins/iOS/Firebase.Firestore.pdb"
12521252
]
12531253
},
12541254
{
@@ -1326,7 +1326,7 @@
13261326
"cpu": "AnyCPU",
13271327
"paths": [
13281328
"Firebase/Plugins/Firebase.TestLab.dll",
1329-
"Firebase/Plugins/Firebase.TestLab.dll.mdb"
1329+
"Firebase/Plugins/Firebase.TestLab.pdb"
13301330
]
13311331
},
13321332
{
@@ -1336,7 +1336,7 @@
13361336
"paths": [
13371337
"Plugins/iOS/Firebase/libFirebaseCppTestlab.a",
13381338
"Firebase/Plugins/iOS/Firebase.TestLab.dll",
1339-
"Firebase/Plugins/iOS/Firebase.TestLab.dll.mdb"
1339+
"Firebase/Plugins/iOS/Firebase.TestLab.pdb"
13401340
]
13411341
},
13421342
{
@@ -1353,7 +1353,7 @@
13531353
"labels": ["gvh_targets-editor"],
13541354
"paths": [
13551355
"Firebase/Editor/Firebase.TestLab.Editor.dll",
1356-
"Firebase/Editor/Firebase.TestLab.Editor.dll.mdb"
1356+
"Firebase/Editor/Firebase.TestLab.Editor.pdb"
13571357
],
13581358
"override_metadata_upm": {
13591359
"PluginImporter": {

0 commit comments

Comments
 (0)