Skip to content

Commit c723515

Browse files
michaelrsweetmichaelrsweet
committed
Merge changes from flutter branch to master.
1 parent 4da7efa commit c723515

File tree

7 files changed

+443
-295
lines changed

7 files changed

+443
-295
lines changed

‎ippevetool/images/default-icon.png

29.3 KB
Loading

‎ippevetool/images/missing-icon.png

5.3 KB
Loading

‎ippevetool/ios/Podfile.lock

+28
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
PODS:
2+
- Flutter (1.0.0)
3+
- nsd_ios (0.0.1):
4+
- Flutter
5+
- url_launcher_ios (0.0.1):
6+
- Flutter
7+
8+
DEPENDENCIES:
9+
- Flutter (from `Flutter`)
10+
- nsd_ios (from `.symlinks/plugins/nsd_ios/ios`)
11+
- url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`)
12+
13+
EXTERNAL SOURCES:
14+
Flutter:
15+
:path: Flutter
16+
nsd_ios:
17+
:path: ".symlinks/plugins/nsd_ios/ios"
18+
url_launcher_ios:
19+
:path: ".symlinks/plugins/url_launcher_ios/ios"
20+
21+
SPEC CHECKSUMS:
22+
Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
23+
nsd_ios: 8c37babdc6538e3350dbed3a52674d2edde98173
24+
url_launcher_ios: 6116280ddcfe98ab8820085d8d76ae7449447586
25+
26+
PODFILE CHECKSUM: 4e8f8b2be68aeea4c0d5beb6ff1e79fface1d048
27+
28+
COCOAPODS: 1.11.3

‎ippevetool/ios/Runner.xcodeproj/project.pbxproj

+44-44
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88

99
/* Begin PBXBuildFile section */
1010
1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; };
11+
397FE4DD88782CAF0CC41D73 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0403A1EA6F858123B72BA360 /* Pods_Runner.framework */; };
1112
3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
12-
6D31E54F80760CEF04EA28BB /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 55A58647BE0354792F66A4E9 /* Pods_Runner.framework */; };
1313
74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; };
1414
97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; };
1515
97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; };
@@ -30,37 +30,56 @@
3030
/* End PBXCopyFilesBuildPhase section */
3131

3232
/* Begin PBXFileReference section */
33+
0403A1EA6F858123B72BA360 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
3334
1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = "<group>"; };
3435
1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = "<group>"; };
36+
16B9A82208C1AC0D3D7FD372 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = "<group>"; };
3537
3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };
36-
55A58647BE0354792F66A4E9 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
37-
5BA66091D22CA2FA3B736B6F /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; };
38-
657987B5FD9A103860CED496 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };
3938
74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = "<group>"; };
4039
74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
4140
7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = "<group>"; };
42-
96F2A5109C9D557BDB232624 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = "<group>"; };
4341
9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = "<group>"; };
4442
9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = "<group>"; };
4543
97C146EE1CF9000F007C117D /* Runner.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Runner.app; sourceTree = BUILT_PRODUCTS_DIR; };
4644
97C146FB1CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
4745
97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
4846
97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
4947
97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
48+
A1734E00AB82CF25054362C9 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };
49+
F83C84EEB56E7149D2DBF3AD /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; };
5050
/* End PBXFileReference section */
5151

5252
/* Begin PBXFrameworksBuildPhase section */
5353
97C146EB1CF9000F007C117D /* Frameworks */ = {
5454
isa = PBXFrameworksBuildPhase;
5555
buildActionMask = 2147483647;
5656
files = (
57-
6D31E54F80760CEF04EA28BB /* Pods_Runner.framework in Frameworks */,
57+
397FE4DD88782CAF0CC41D73 /* Pods_Runner.framework in Frameworks */,
5858
);
5959
runOnlyForDeploymentPostprocessing = 0;
6060
};
6161
/* End PBXFrameworksBuildPhase section */
6262

6363
/* Begin PBXGroup section */
64+
6C127CA3C58D973B330CFE5E /* Pods */ = {
65+
isa = PBXGroup;
66+
children = (
67+
16B9A82208C1AC0D3D7FD372 /* Pods-Runner.debug.xcconfig */,
68+
A1734E00AB82CF25054362C9 /* Pods-Runner.release.xcconfig */,
69+
F83C84EEB56E7149D2DBF3AD /* Pods-Runner.profile.xcconfig */,
70+
);
71+
name = Pods;
72+
path = Pods;
73+
sourceTree = "<group>";
74+
};
75+
906FECEBDA7E6E9E4A94A6F7 /* Frameworks */ = {
76+
isa = PBXGroup;
77+
children = (
78+
0403A1EA6F858123B72BA360 /* Pods_Runner.framework */,
79+
);
80+
name = Frameworks;
81+
sourceTree = "<group>";
82+
};
6483
9740EEB11CF90186004384FC /* Flutter */ = {
6584
isa = PBXGroup;
6685
children = (
@@ -78,8 +97,8 @@
7897
9740EEB11CF90186004384FC /* Flutter */,
7998
97C146F01CF9000F007C117D /* Runner */,
8099
97C146EF1CF9000F007C117D /* Products */,
81-
B6125DA08609227B36A6C3F7 /* Pods */,
82-
E4D9A3228420C29FE0215475 /* Frameworks */,
100+
6C127CA3C58D973B330CFE5E /* Pods */,
101+
906FECEBDA7E6E9E4A94A6F7 /* Frameworks */,
83102
);
84103
sourceTree = "<group>";
85104
};
@@ -106,40 +125,21 @@
106125
path = Runner;
107126
sourceTree = "<group>";
108127
};
109-
B6125DA08609227B36A6C3F7 /* Pods */ = {
110-
isa = PBXGroup;
111-
children = (
112-
96F2A5109C9D557BDB232624 /* Pods-Runner.debug.xcconfig */,
113-
657987B5FD9A103860CED496 /* Pods-Runner.release.xcconfig */,
114-
5BA66091D22CA2FA3B736B6F /* Pods-Runner.profile.xcconfig */,
115-
);
116-
name = Pods;
117-
path = Pods;
118-
sourceTree = "<group>";
119-
};
120-
E4D9A3228420C29FE0215475 /* Frameworks */ = {
121-
isa = PBXGroup;
122-
children = (
123-
55A58647BE0354792F66A4E9 /* Pods_Runner.framework */,
124-
);
125-
name = Frameworks;
126-
sourceTree = "<group>";
127-
};
128128
/* End PBXGroup section */
129129

130130
/* Begin PBXNativeTarget section */
131131
97C146ED1CF9000F007C117D /* Runner */ = {
132132
isa = PBXNativeTarget;
133133
buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */;
134134
buildPhases = (
135-
7B5F914E0E3F3C73D9648421 /* [CP] Check Pods Manifest.lock */,
135+
E794F00F453635415E8006A7 /* [CP] Check Pods Manifest.lock */,
136136
9740EEB61CF901F6004384FC /* Run Script */,
137137
97C146EA1CF9000F007C117D /* Sources */,
138138
97C146EB1CF9000F007C117D /* Frameworks */,
139139
97C146EC1CF9000F007C117D /* Resources */,
140140
9705A1C41CF9048500538489 /* Embed Frameworks */,
141141
3B06AD1E1E4923F5004D2608 /* Thin Binary */,
142-
D6B65FE002AC44307B4C9D57 /* [CP] Embed Pods Frameworks */,
142+
90BB2752E01D58CF153883E3 /* [CP] Embed Pods Frameworks */,
143143
);
144144
buildRules = (
145145
);
@@ -214,26 +214,21 @@
214214
shellPath = /bin/sh;
215215
shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin";
216216
};
217-
7B5F914E0E3F3C73D9648421 /* [CP] Check Pods Manifest.lock */ = {
217+
90BB2752E01D58CF153883E3 /* [CP] Embed Pods Frameworks */ = {
218218
isa = PBXShellScriptBuildPhase;
219219
buildActionMask = 2147483647;
220220
files = (
221221
);
222222
inputFileListPaths = (
223+
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist",
223224
);
224-
inputPaths = (
225-
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
226-
"${PODS_ROOT}/Manifest.lock",
227-
);
228-
name = "[CP] Check Pods Manifest.lock";
225+
name = "[CP] Embed Pods Frameworks";
229226
outputFileListPaths = (
230-
);
231-
outputPaths = (
232-
"$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt",
227+
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist",
233228
);
234229
runOnlyForDeploymentPostprocessing = 0;
235230
shellPath = /bin/sh;
236-
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
231+
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
237232
showEnvVarsInLog = 0;
238233
};
239234
9740EEB61CF901F6004384FC /* Run Script */ = {
@@ -251,21 +246,26 @@
251246
shellPath = /bin/sh;
252247
shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build";
253248
};
254-
D6B65FE002AC44307B4C9D57 /* [CP] Embed Pods Frameworks */ = {
249+
E794F00F453635415E8006A7 /* [CP] Check Pods Manifest.lock */ = {
255250
isa = PBXShellScriptBuildPhase;
256251
buildActionMask = 2147483647;
257252
files = (
258253
);
259254
inputFileListPaths = (
260-
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist",
261255
);
262-
name = "[CP] Embed Pods Frameworks";
256+
inputPaths = (
257+
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
258+
"${PODS_ROOT}/Manifest.lock",
259+
);
260+
name = "[CP] Check Pods Manifest.lock";
263261
outputFileListPaths = (
264-
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist",
262+
);
263+
outputPaths = (
264+
"$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt",
265265
);
266266
runOnlyForDeploymentPostprocessing = 0;
267267
shellPath = /bin/sh;
268-
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
268+
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
269269
showEnvVarsInLog = 0;
270270
};
271271
/* End PBXShellScriptBuildPhase section */

‎ippevetool/lib/ipptool.dart

+16-6
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
//
2-
// ipptool support functions.
2+
// IPP Everywhere Tool (ippevetool) support functions.
33
//
44
// Copyright © 2024 by the IEEE-ISTO Printer Working Group.
55
//
@@ -17,17 +17,27 @@ import 'package:xml/xml.dart';
1717
Future<Map<String,dynamic>> ipptoolGetAttributes({required String printerUri}) async {
1818
var process = await Process.start("ipptool", ["-j", printerUri, "get-printer-attributes.test"]);
1919
var json = "";
20-
process.stderr.pipe(stderr);
20+
var error = "";
2121
await process.stdout
2222
.transform(utf8.decoder)
2323
.forEach((text) {
2424
json = json + text;
2525
});
26-
var result = process.exitCode;
26+
await process.stderr
27+
.transform(utf8.decoder)
28+
.forEach((text) {
29+
error = error + text.replaceAll("\n", " ");
30+
});
31+
//var result = process.exitCode;
2732

2833
//print("result=$result\n");
2934
//print("json=$json\n");
35+
//print("error=$error\n");
3036

37+
if (json == "") {
38+
json = "[{},{\"ipptool-error\":\"$error\"}]";
39+
}
40+
3141
const JsonDecoder decoder = JsonDecoder();
3242

3343
return (decoder.convert(json)[1]);
@@ -59,10 +69,10 @@ Future<XmlDocument> ipptoolRunTest({required String printerUri, required String
5969
.forEach((text) {
6070
plist = plist + text;
6171
});
62-
var result = process.exitCode;
72+
// var result = process.exitCode;
6373

64-
print("result=$result\n");
65-
print("plist=$plist\n");
74+
// print("result=$result\n");
75+
// print("plist=$plist\n");
6676

6777
return (XmlDocument.parse(plist));
6878
}

0 commit comments

Comments
 (0)