Produced by Araxis Merge on 9/25/2018 2:13:30 PM Central Daylight Time. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a modern standards-compliant browser. For optimum results when printing this report, use landscape orientation and enable printing of background images and colours in your browser.
# | Location | File | Last Modified |
---|---|---|---|
1 | build 3.zip\build 3\Patch 130\MHA_WEB\MockInstrumentSelect | aMockInstrumentAdmin.dproj | Fri May 11 14:11:34 2018 UTC |
2 | build 3.zip\build 3\Patch 130\MHA_WEB\MockInstrumentSelect | aMockInstrumentAdmin.dproj | Wed Sep 12 18:26:48 2018 UTC |
Description | Between Files 1 and 2 |
|
---|---|---|
Text Blocks | Lines | |
Unchanged | 2 | 1066 |
Changed | 1 | 2 |
Inserted | 0 | 0 |
Removed | 0 | 0 |
Whitespace | |
---|---|
Character case | Differences in character case are significant |
Line endings | Differences in line endings (CR and LF characters) are ignored |
CR/LF characters | Not shown in the comparison detail |
No regular expressions were active.
1 | <Project x mlns="http ://schemas .microsoft .com/devel oper/msbui ld/2003"> | |
2 | <Prope rtyGroup> | |
3 | <P rojectGuid >{E9DFEB1E -DB3F-4382 -8181-1380 DC9015D1}< /ProjectGu id> | |
4 | <P rojectVers ion>17.2</ ProjectVer sion> | |
5 | <F rameworkTy pe>VCL</Fr ameworkTyp e> | |
6 | <M ainSource> aMockInstr umentAdmin .dpr</Main Source> | |
7 | <B ase>True</ Base> | |
8 | <C onfig Cond ition="'$( Config)'== ''">Debug< /Config> | |
9 | <P latform Co ndition="' $(Platform )'==''">Wi n32</Platf orm> | |
10 | <T argetedPla tforms>1</ TargetedPl atforms> | |
11 | <A ppType>App lication</ AppType> | |
12 | </Prop ertyGroup> | |
13 | <Prope rtyGroup C ondition=" '$(Config) '=='Base' or '$(Base )'!=''"> | |
14 | <B ase>true</ Base> | |
15 | </Prop ertyGroup> | |
16 | <Prope rtyGroup C ondition=" ('$(Platfo rm)'=='Win 32' and '$ (Base)'==' true') or '$(Base_Wi n32)'!=''" > | |
17 | <B ase_Win32> true</Base _Win32> | |
18 | <C fgParent>B ase</CfgPa rent> | |
19 | <B ase>true</ Base> | |
20 | </Prop ertyGroup> | |
21 | <Prope rtyGroup C ondition=" ('$(Platfo rm)'=='Win 64' and '$ (Base)'==' true') or '$(Base_Wi n64)'!=''" > | |
22 | <B ase_Win64> true</Base _Win64> | |
23 | <C fgParent>B ase</CfgPa rent> | |
24 | <B ase>true</ Base> | |
25 | </Prop ertyGroup> | |
26 | <Prope rtyGroup C ondition=" '$(Config) '=='Debug' or '$(Cfg _1)'!=''"> | |
27 | <C fg_1>true< /Cfg_1> | |
28 | <C fgParent>B ase</CfgPa rent> | |
29 | <B ase>true</ Base> | |
30 | </Prop ertyGroup> | |
31 | <Prope rtyGroup C ondition=" ('$(Platfo rm)'=='Win 32' and '$ (Cfg_1)'== 'true') or '$(Cfg_1_ Win32)'!=' '"> | |
32 | <C fg_1_Win32 >true</Cfg _1_Win32> | |
33 | <C fgParent>C fg_1</CfgP arent> | |
34 | <C fg_1>true< /Cfg_1> | |
35 | <B ase>true</ Base> | |
36 | </Prop ertyGroup> | |
37 | <Prope rtyGroup C ondition=" '$(Config) '=='Releas e' or '$(C fg_2)'!='' "> | |
38 | <C fg_2>true< /Cfg_2> | |
39 | <C fgParent>B ase</CfgPa rent> | |
40 | <B ase>true</ Base> | |
41 | </Prop ertyGroup> | |
42 | <Prope rtyGroup C ondition=" '$(Base)'! =''"> | |
43 | <S anitizedPr ojectName> aMockInstr umentAdmin </Sanitize dProjectNa me> | |
44 | <D CC_Namespa ce>System; Xml;Data;D atasnap;We b;Soap;Vcl ;Vcl.Imagi ng;Vcl.Tou ch;Vcl.Sam ples;Vcl.S hell;$(DCC _Namespace )</DCC_Nam espace> | |
45 | <I con_MainIc on>$(BDS)\ bin\delphi _PROJECTIC ON.ico</Ic on_MainIco n> | |
46 | <D CC_DcuOutp ut>.\$(Pla tform)\$(C onfig)</DC C_DcuOutpu t> | |
47 | <D CC_ExeOutp ut>.\$(Pla tform)\$(C onfig)</DC C_ExeOutpu t> | |
48 | <D CC_E>false </DCC_E> | |
49 | <D CC_N>false </DCC_N> | |
50 | <D CC_S>false </DCC_S> | |
51 | <D CC_F>false </DCC_F> | |
52 | <D CC_K>false </DCC_K> | |
53 | </Prop ertyGroup> | |
54 | <Prope rtyGroup C ondition=" '$(Base_Wi n32)'!=''" > | |
55 | <D CC_UsePack age>JvGlob us;JvMM;Jv ManagedThr eads;FireD ACSqliteDr iver;DBXSq liteDriver ;FireDACPg Driver;fmx ;JvDlgs;In dySystem;J vCrypt;Tee DB;tetheri ng;vclib;D BXInterBas eDriver;Jv Net;JvDotN etCtrls;Db xCommonDri ver;XWB_Ru nTime;vcli mg;dbxcds; appanalyti cs;JvXPCtr ls;vcldb;v cldsnap;fm xFireDAC;C ustomIPTra nsport;JvC ore;vclrib bon;dsnap; IndyIPServ er;fmxase; vcl;IndyCo re;IndyIPC ommon;Clou dService;C odeSiteExp ressPkg;Fm xTeeUI;Fir eDACIBDriv er;JvAppFr m;soapserv er;JvDB;Jv RuntimeDes ign;inetdb xpress;dsn apxml;JclD eveloperTo ols;JvDock ing;adortl ;JvWizards ;FireDACAS ADriver;Jv HMI;bindco mpfmx;JvBa nds;FireDA CODBCDrive r;RESTBack endCompone nts;rtl;db rtl;DbxCli entDriver; FireDACCom mon;bindco mp;inetdb; JvPluginSy stem;Tee;J clContaine rs;ibmonit or;vclFire DAC;JvCmp; JvSystem;x mlrtl;svnu i;ibxpress ;JvTimeFra mework;JvC ontrols;In dyProtocol s;DBXMySQL Driver;Fir eDACCommon Driver;bin dcompdbx;s oaprtl;bin dengine;vc lactnband; FMXTee;Tee UI;bindcom pvcl;JvStd Ctrls;JvCu stom;Jcl;v clie;JvJan s;JvPageCo mps;JvPrin tPreview;F ireDACADSD river;vclt ouch;VclSm p;FireDAC; VCLRESTCom ponents;In traweb;dsn apcon;inet ;fmxobj;Jc lVcl;JvPas calInterpr eter;FireD ACMySQLDri ver;soapmi das;vclx;s vn;fmxdae; RESTCompon ents;FireD ACMSAccDri ver;dbexpr ess;IndyIP Client;$(D CC_UsePack age)</DCC_ UsePackage > | |
56 | <V erInfo_Loc ale>1033</ VerInfo_Lo cale> | |
57 | <V erInfo_Inc ludeVerInf o>true</Ve rInfo_Incl udeVerInfo > | |
58 | <M anifest_Fi le>$(BDS)\ bin\defaul t_app.mani fest</Mani fest_File> | |
59 | <V erInfo_Key s>CompanyN ame=;FileD escription =;FileVers ion=1.0.0. 0;Internal Name=;Lega lCopyright =;LegalTra demarks=;O riginalFil ename=;Pro ductName=; ProductVer sion=1.0.0 .0;Comment s=</VerInf o_Keys> | |
60 | <D CC_Namespa ce>Winapi; System.Win ;Data.Win; Datasnap.W in;Web.Win ;Soap.Win; Xml.Win;Bd e;$(DCC_Na mespace)</ DCC_Namesp ace> | |
61 | </Prop ertyGroup> | |
62 | <Prope rtyGroup C ondition=" '$(Base_Wi n64)'!=''" > | |
63 | <D CC_UsePack age>FireDA CSqliteDri ver;DBXSql iteDriver; FireDACPgD river;fmx; IndySystem ;TeeDB;tet hering;vcl ib;DBXInte rBaseDrive r;DbxCommo nDriver;vc limg;dbxcd s;appanaly tics;vcldb ;vcldsnap; fmxFireDAC ;CustomIPT ransport;v clribbon;d snap;IndyI PServer;fm xase;vcl;I ndyCore;In dyIPCommon ;CloudServ ice;FmxTee UI;FireDAC IBDriver;s oapserver; inetdbxpre ss;dsnapxm l;adortl;F ireDACASAD river;bind compfmx;Fi reDACODBCD river;REST BackendCom ponents;rt l;dbrtl;Db xClientDri ver;FireDA CCommon;bi ndcomp;ine tdb;Tee;ib monitor;vc lFireDAC;x mlrtl;ibxp ress;IndyP rotocols;D BXMySQLDri ver;FireDA CCommonDri ver;bindco mpdbx;soap rtl;binden gine;vclac tnband;FMX Tee;TeeUI; bindcompvc l;vclie;Fi reDACADSDr iver;vclto uch;VclSmp ;FireDAC;V CLRESTComp onents;Int raweb;dsna pcon;inet; fmxobj;Fir eDACMySQLD river;soap midas;vclx ;fmxdae;RE STComponen ts;FireDAC MSAccDrive r;dbexpres s;IndyIPCl ient;$(DCC _UsePackag e)</DCC_Us ePackage> | |
64 | </Prop ertyGroup> | |
65 | <Prope rtyGroup C ondition=" '$(Cfg_1)' !=''"> | |
66 | <D CC_Define> DEBUG;$(DC C_Define)< /DCC_Defin e> | |
67 | <D CC_DebugDC Us>true</D CC_DebugDC Us> | |
68 | <D CC_Optimiz e>false</D CC_Optimiz e> | |
69 | <D CC_Generat eStackFram es>true</D CC_Generat eStackFram es> | |
70 | <D CC_DebugIn foInExe>tr ue</DCC_De bugInfoInE xe> | |
71 | <D CC_RemoteD ebug>true< /DCC_Remot eDebug> | |
72 | </Prop ertyGroup> | |
73 | <Prope rtyGroup C ondition=" '$(Cfg_1_W in32)'!='' "> | |
74 | <Debugger_ RunParams> S=vhaislhm pe02. . URL P=9061 H=3 003 D=true W=C:\data \RTC_Sandb ox\YS_130\ MHLTH_YS_S ource\Java Script\mha -web\build \index.htm l</Debugge r_RunParam s> | |
75 | <V erInfo_Inc ludeVerInf o>true</Ve rInfo_Incl udeVerInfo > | |
76 | <V erInfo_Loc ale>1033</ VerInfo_Lo cale> | |
77 | <D CC_RemoteD ebug>false </DCC_Remo teDebug> | |
78 | </Prop ertyGroup> | |
79 | <Prope rtyGroup C ondition=" '$(Cfg_2)' !=''"> | |
80 | <D CC_LocalDe bugSymbols >false</DC C_LocalDeb ugSymbols> | |
81 | <D CC_Define> RELEASE;$( DCC_Define )</DCC_Def ine> | |
82 | <D CC_SymbolR eferenceIn fo>0</DCC_ SymbolRefe renceInfo> | |
83 | <D CC_DebugIn formation> 0</DCC_Deb ugInformat ion> | |
84 | </Prop ertyGroup> | |
85 | <ItemG roup> | |
86 | <D elphiCompi le Include ="$(MainSo urce)"> | |
87 | <MainSou rce>MainSo urce</Main Source> | |
88 | </ DelphiComp ile> | |
89 | <D CCReferenc e Include= "fMockInst rumentSele ct.pas"> | |
90 | <Form>fr mMockInstr umentSelec t</Form> | |
91 | <FormTyp e>dfm</For mType> | |
92 | </ DCCReferen ce> | |
93 | <D CCReferenc e Include= "..\uWebTy pes.pas"/> | |
94 | <D CCReferenc e Include= "..\uEmbed dedHTTPSer ver.pas"/> | |
95 | <D CCReferenc e Include= "..\fDebug .pas"> | |
96 | <Form>fr mDebug</Fo rm> | |
97 | <FormTyp e>dfm</For mType> | |
98 | </ DCCReferen ce> | |
99 | <D CCReferenc e Include= "..\uWebRP C.pas"/> | |
100 | <D CCReferenc e Include= "..\fWebBr owser.pas" > | |
101 | <Form>fr mWebBrowse r</Form> | |
102 | <FormTyp e>dfm</For mType> | |
103 | </ DCCReferen ce> | |
104 | <D CCReferenc e Include= "fSetNumbe r.pas"> | |
105 | <Form>fr mSetNumber </Form> | |
106 | <FormTyp e>dfm</For mType> | |
107 | </ DCCReferen ce> | |
108 | <B uildConfig uration In clude="Rel ease"> | |
109 | <Key>Cfg _2</Key> | |
110 | <CfgPare nt>Base</C fgParent> | |
111 | </ BuildConfi guration> | |
112 | <B uildConfig uration In clude="Bas e"> | |
113 | <Key>Bas e</Key> | |
114 | </ BuildConfi guration> | |
115 | <B uildConfig uration In clude="Deb ug"> | |
116 | <Key>Cfg _1</Key> | |
117 | <CfgPare nt>Base</C fgParent> | |
118 | </ BuildConfi guration> | |
119 | </Item Group> | |
120 | <Proje ctExtensio ns> | |
121 | <B orland.Per sonality>D elphi.Pers onality.12 </Borland. Personalit y> | |
122 | <B orland.Pro jectType>A pplication </Borland. ProjectTyp e> | |
123 | <B orlandProj ect> | |
124 | <Delphi. Personalit y> | |
125 | <Sou rce> | |
126 | <Source Na me="MainSo urce">aMoc kInstrumen tAdmin.dpr </Source> | |
127 | </So urce> | |
128 | <Exc luded_Pack ages> | |
129 | <Excluded_ Packages N ame="$(BDS BIN)\dclof fice2k220. bpl">Micro soft Offic e 2000 Sam ple Automa tion Serve r Wrapper Components </Excluded _Packages> | |
130 | <Excluded_ Packages N ame="$(BDS BIN)\dclof ficexp220. bpl">Micro soft Offic e XP Sampl e Automati on Server Wrapper Co mponents</ Excluded_P ackages> | |
131 | </Ex cluded_Pac kages> | |
132 | </Delphi .Personali ty> | |
133 | <Deploym ent Versio n="2"> | |
134 | <Dep loyFile Lo calName="W in32\Debug \aMockInst rumentAdmi n.exe" Con figuration ="Debug" C lass="Proj ectOutput" > | |
135 | <Platform Name="Win3 2"> | |
136 | <Remot eName>aMoc kInstrumen tAdmin.exe </RemoteNa me> | |
137 | <Overw rite>true< /Overwrite > | |
138 | </Platform > | |
139 | </De ployFile> | |
140 | <Dep loyClass R equired="t rue" Name= "Dependenc yPackage"> | |
141 | <Platform Name="iOSD evice64"> | |
142 | <Opera tion>1</Op eration> | |
143 | <Exten sions>.dyl ib</Extens ions> | |
144 | </Platform > | |
145 | <Platform Name="Win3 2"> | |
146 | <Opera tion>0</Op eration> | |
147 | <Exten sions>.bpl </Extensio ns> | |
148 | </Platform > | |
149 | <Platform Name="OSX3 2"> | |
150 | <Remot eDir>Conte nts\MacOS< /RemoteDir > | |
151 | <Opera tion>1</Op eration> | |
152 | <Exten sions>.dyl ib</Extens ions> | |
153 | </Platform > | |
154 | <Platform Name="iOSS imulator"> | |
155 | <Opera tion>1</Op eration> | |
156 | <Exten sions>.dyl ib</Extens ions> | |
157 | </Platform > | |
158 | <Platform Name="iOSD evice32"> | |
159 | <Opera tion>1</Op eration> | |
160 | <Exten sions>.dyl ib</Extens ions> | |
161 | </Platform > | |
162 | </De ployClass> | |
163 | <Dep loyClass N ame="Depen dencyModul e"> | |
164 | <Platform Name="iOSD evice64"> | |
165 | <Opera tion>1</Op eration> | |
166 | <Exten sions>.dyl ib</Extens ions> | |
167 | </Platform > | |
168 | <Platform Name="Win3 2"> | |
169 | <Opera tion>0</Op eration> | |
170 | <Exten sions>.dll ;.bpl</Ext ensions> | |
171 | </Platform > | |
172 | <Platform Name="OSX3 2"> | |
173 | <Remot eDir>Conte nts\MacOS< /RemoteDir > | |
174 | <Opera tion>1</Op eration> | |
175 | <Exten sions>.dyl ib</Extens ions> | |
176 | </Platform > | |
177 | <Platform Name="iOSS imulator"> | |
178 | <Opera tion>1</Op eration> | |
179 | <Exten sions>.dyl ib</Extens ions> | |
180 | </Platform > | |
181 | <Platform Name="iOSD evice32"> | |
182 | <Opera tion>1</Op eration> | |
183 | <Exten sions>.dyl ib</Extens ions> | |
184 | </Platform > | |
185 | </De ployClass> | |
186 | <Dep loyClass N ame="iPad_ Launch2048 "> | |
187 | <Platform Name="iOSD evice64"> | |
188 | <Opera tion>1</Op eration> | |
189 | </Platform > | |
190 | <Platform Name="iOSS imulator"> | |
191 | <Opera tion>1</Op eration> | |
192 | </Platform > | |
193 | <Platform Name="iOSD evice32"> | |
194 | <Opera tion>1</Op eration> | |
195 | </Platform > | |
196 | </De ployClass> | |
197 | <Dep loyClass N ame="Proje ctOSXInfoP List"> | |
198 | <Platform Name="OSX3 2"> | |
199 | <Remot eDir>Conte nts</Remot eDir> | |
200 | <Opera tion>1</Op eration> | |
201 | </Platform > | |
202 | </De ployClass> | |
203 | <Dep loyClass N ame="Proje ctiOSDevic eDebug"> | |
204 | <Platform Name="iOSD evice64"> | |
205 | <Remot eDir>..\$( PROJECTNAM E).app.dSY M\Contents \Resources \DWARF</Re moteDir> | |
206 | <Opera tion>1</Op eration> | |
207 | </Platform > | |
208 | <Platform Name="iOSD evice32"> | |
209 | <Remot eDir>..\$( PROJECTNAM E).app.dSY M\Contents \Resources \DWARF</Re moteDir> | |
210 | <Opera tion>1</Op eration> | |
211 | </Platform > | |
212 | </De ployClass> | |
213 | <Dep loyClass N ame="Andro id_SplashI mage470"> | |
214 | <Platform Name="Andr oid"> | |
215 | <Remot eDir>res\d rawable-no rmal</Remo teDir> | |
216 | <Opera tion>1</Op eration> | |
217 | </Platform > | |
218 | </De ployClass> | |
219 | <Dep loyClass N ame="Andro idLibnativ eX86File"> | |
220 | <Platform Name="Andr oid"> | |
221 | <Remot eDir>libra ry\lib\x86 </RemoteDi r> | |
222 | <Opera tion>1</Op eration> | |
223 | </Platform > | |
224 | </De ployClass> | |
225 | <Dep loyClass N ame="Proje ctiOSResou rce"> | |
226 | <Platform Name="iOSD evice64"> | |
227 | <Opera tion>1</Op eration> | |
228 | </Platform > | |
229 | <Platform Name="iOSS imulator"> | |
230 | <Opera tion>1</Op eration> | |
231 | </Platform > | |
232 | <Platform Name="iOSD evice32"> | |
233 | <Opera tion>1</Op eration> | |
234 | </Platform > | |
235 | </De ployClass> | |
236 | <Dep loyClass N ame="Proje ctOSXEntit lements"> | |
237 | <Platform Name="OSX3 2"> | |
238 | <Remot eDir>../</ RemoteDir> | |
239 | <Opera tion>1</Op eration> | |
240 | </Platform > | |
241 | </De ployClass> | |
242 | <Dep loyClass N ame="Andro idGDBServe r"> | |
243 | <Platform Name="Andr oid"> | |
244 | <Remot eDir>libra ry\lib\arm eabi-v7a</ RemoteDir> | |
245 | <Opera tion>1</Op eration> | |
246 | </Platform > | |
247 | </De ployClass> | |
248 | <Dep loyClass N ame="iPhon e_Launch64 0"> | |
249 | <Platform Name="iOSD evice64"> | |
250 | <Opera tion>1</Op eration> | |
251 | </Platform > | |
252 | <Platform Name="iOSS imulator"> | |
253 | <Opera tion>1</Op eration> | |
254 | </Platform > | |
255 | <Platform Name="iOSD evice32"> | |
256 | <Opera tion>1</Op eration> | |
257 | </Platform > | |
258 | </De ployClass> | |
259 | <Dep loyClass N ame="Andro id_SplashI mage960"> | |
260 | <Platform Name="Andr oid"> | |
261 | <Remot eDir>res\d rawable-xl arge</Remo teDir> | |
262 | <Opera tion>1</Op eration> | |
263 | </Platform > | |
264 | </De ployClass> | |
265 | <Dep loyClass N ame="Andro id_Launche rIcon96"> | |
266 | <Platform Name="Andr oid"> | |
267 | <Remot eDir>res\d rawable-xh dpi</Remot eDir> | |
268 | <Opera tion>1</Op eration> | |
269 | </Platform > | |
270 | </De ployClass> | |
271 | <Dep loyClass N ame="iPhon e_Launch32 0"> | |
272 | <Platform Name="iOSD evice64"> | |
273 | <Opera tion>1</Op eration> | |
274 | </Platform > | |
275 | <Platform Name="iOSS imulator"> | |
276 | <Opera tion>1</Op eration> | |
277 | </Platform > | |
278 | <Platform Name="iOSD evice32"> | |
279 | <Opera tion>1</Op eration> | |
280 | </Platform > | |
281 | </De ployClass> | |
282 | <Dep loyClass N ame="Andro id_Launche rIcon144"> | |
283 | <Platform Name="Andr oid"> | |
284 | <Remot eDir>res\d rawable-xx hdpi</Remo teDir> | |
285 | <Opera tion>1</Op eration> | |
286 | </Platform > | |
287 | </De ployClass> | |
288 | <Dep loyClass N ame="Andro idLibnativ eMipsFile" > | |
289 | <Platform Name="Andr oid"> | |
290 | <Remot eDir>libra ry\lib\mip s</RemoteD ir> | |
291 | <Opera tion>1</Op eration> | |
292 | </Platform > | |
293 | </De ployClass> | |
294 | <Dep loyClass N ame="Andro idSplashIm ageDef"> | |
295 | <Platform Name="Andr oid"> | |
296 | <Remot eDir>res\d rawable</R emoteDir> | |
297 | <Opera tion>1</Op eration> | |
298 | </Platform > | |
299 | </De ployClass> | |
300 | <Dep loyClass N ame="Debug Symbols"> | |
301 | <Platform Name="OSX3 2"> | |
302 | <Remot eDir>Conte nts\MacOS< /RemoteDir > | |
303 | <Opera tion>1</Op eration> | |
304 | </Platform > | |
305 | <Platform Name="iOSS imulator"> | |
306 | <Opera tion>1</Op eration> | |
307 | </Platform > | |
308 | <Platform Name="Win3 2"> | |
309 | <Opera tion>0</Op eration> | |
310 | </Platform > | |
311 | </De ployClass> | |
312 | <Dep loyClass N ame="Depen dencyFrame work"> | |
313 | <Platform Name="OSX3 2"> | |
314 | <Remot eDir>Conte nts\MacOS< /RemoteDir > | |
315 | <Opera tion>1</Op eration> | |
316 | <Exten sions>.fra mework</Ex tensions> | |
317 | </Platform > | |
318 | <Platform Name="Win3 2"> | |
319 | <Opera tion>0</Op eration> | |
320 | </Platform > | |
321 | </De ployClass> | |
322 | <Dep loyClass N ame="Andro id_SplashI mage426"> | |
323 | <Platform Name="Andr oid"> | |
324 | <Remot eDir>res\d rawable-sm all</Remot eDir> | |
325 | <Opera tion>1</Op eration> | |
326 | </Platform > | |
327 | </De ployClass> | |
328 | <Dep loyClass N ame="Proje ctiOSEntit lements"> | |
329 | <Platform Name="iOSD evice64"> | |
330 | <Remot eDir>../</ RemoteDir> | |
331 | <Opera tion>1</Op eration> | |
332 | </Platform > | |
333 | <Platform Name="iOSD evice32"> | |
334 | <Remot eDir>../</ RemoteDir> | |
335 | <Opera tion>1</Op eration> | |
336 | </Platform > | |
337 | </De ployClass> | |
338 | <Dep loyClass N ame="Addit ionalDebug Symbols"> | |
339 | <Platform Name="OSX3 2"> | |
340 | <Remot eDir>Conte nts\MacOS< /RemoteDir > | |
341 | <Opera tion>1</Op eration> | |
342 | </Platform > | |
343 | <Platform Name="iOSS imulator"> | |
344 | <Opera tion>1</Op eration> | |
345 | </Platform > | |
346 | <Platform Name="Win3 2"> | |
347 | <Remot eDir>Conte nts\MacOS< /RemoteDir > | |
348 | <Opera tion>0</Op eration> | |
349 | </Platform > | |
350 | </De ployClass> | |
351 | <Dep loyClass N ame="Andro idClassesD exFile"> | |
352 | <Platform Name="Andr oid"> | |
353 | <Remot eDir>class es</Remote Dir> | |
354 | <Opera tion>1</Op eration> | |
355 | </Platform > | |
356 | </De ployClass> | |
357 | <Dep loyClass N ame="Proje ctiOSInfoP List"> | |
358 | <Platform Name="iOSD evice64"> | |
359 | <Opera tion>1</Op eration> | |
360 | </Platform > | |
361 | <Platform Name="iOSS imulator"> | |
362 | <Opera tion>1</Op eration> | |
363 | </Platform > | |
364 | <Platform Name="iOSD evice32"> | |
365 | <Opera tion>1</Op eration> | |
366 | </Platform > | |
367 | </De ployClass> | |
368 | <Dep loyClass N ame="iPad_ Launch1024 "> | |
369 | <Platform Name="iOSD evice64"> | |
370 | <Opera tion>1</Op eration> | |
371 | </Platform > | |
372 | <Platform Name="iOSS imulator"> | |
373 | <Opera tion>1</Op eration> | |
374 | </Platform > | |
375 | <Platform Name="iOSD evice32"> | |
376 | <Opera tion>1</Op eration> | |
377 | </Platform > | |
378 | </De ployClass> | |
379 | <Dep loyClass N ame="Andro id_Default AppIcon"> | |
380 | <Platform Name="Andr oid"> | |
381 | <Remot eDir>res\d rawable</R emoteDir> | |
382 | <Opera tion>1</Op eration> | |
383 | </Platform > | |
384 | </De ployClass> | |
385 | <Dep loyClass N ame="Proje ctOSXResou rce"> | |
386 | <Platform Name="OSX3 2"> | |
387 | <Remot eDir>Conte nts\Resour ces</Remot eDir> | |
388 | <Opera tion>1</Op eration> | |
389 | </Platform > | |
390 | </De ployClass> | |
391 | <Dep loyClass N ame="Proje ctiOSDevic eResourceR ules"> | |
392 | <Platform Name="iOSD evice64"> | |
393 | <Opera tion>1</Op eration> | |
394 | </Platform > | |
395 | <Platform Name="iOSD evice32"> | |
396 | <Opera tion>1</Op eration> | |
397 | </Platform > | |
398 | </De ployClass> | |
399 | <Dep loyClass N ame="iPad_ Launch768" > | |
400 | <Platform Name="iOSD evice64"> | |
401 | <Opera tion>1</Op eration> | |
402 | </Platform > | |
403 | <Platform Name="iOSS imulator"> | |
404 | <Opera tion>1</Op eration> | |
405 | </Platform > | |
406 | <Platform Name="iOSD evice32"> | |
407 | <Opera tion>1</Op eration> | |
408 | </Platform > | |
409 | </De ployClass> | |
410 | <Dep loyClass R equired="t rue" Name= "ProjectOu tput"> | |
411 | <Platform Name="Andr oid"> | |
412 | <Remot eDir>libra ry\lib\arm eabi-v7a</ RemoteDir> | |
413 | <Opera tion>1</Op eration> | |
414 | </Platform > | |
415 | <Platform Name="iOSD evice64"> | |
416 | <Opera tion>1</Op eration> | |
417 | </Platform > | |
418 | <Platform Name="Win3 2"> | |
419 | <Opera tion>0</Op eration> | |
420 | </Platform > | |
421 | <Platform Name="OSX3 2"> | |
422 | <Remot eDir>Conte nts\MacOS< /RemoteDir > | |
423 | <Opera tion>1</Op eration> | |
424 | </Platform > | |
425 | <Platform Name="iOSS imulator"> | |
426 | <Opera tion>1</Op eration> | |
427 | </Platform > | |
428 | <Platform Name="iOSD evice32"> | |
429 | <Opera tion>1</Op eration> | |
430 | </Platform > | |
431 | </De ployClass> | |
432 | <Dep loyClass N ame="Andro idLibnativ eArmeabiFi le"> | |
433 | <Platform Name="Andr oid"> | |
434 | <Remot eDir>libra ry\lib\arm eabi</Remo teDir> | |
435 | <Opera tion>1</Op eration> | |
436 | </Platform > | |
437 | </De ployClass> | |
438 | <Dep loyClass N ame="Andro id_SplashI mage640"> | |
439 | <Platform Name="Andr oid"> | |
440 | <Remot eDir>res\d rawable-la rge</Remot eDir> | |
441 | <Opera tion>1</Op eration> | |
442 | </Platform > | |
443 | </De ployClass> | |
444 | <Dep loyClass N ame="File" > | |
445 | <Platform Name="Andr oid"> | |
446 | <Opera tion>0</Op eration> | |
447 | </Platform > | |
448 | <Platform Name="iOSD evice64"> | |
449 | <Opera tion>0</Op eration> | |
450 | </Platform > | |
451 | <Platform Name="Win3 2"> | |
452 | <Opera tion>0</Op eration> | |
453 | </Platform > | |
454 | <Platform Name="OSX3 2"> | |
455 | <Remot eDir>Conte nts\MacOS< /RemoteDir > | |
456 | <Opera tion>0</Op eration> | |
457 | </Platform > | |
458 | <Platform Name="iOSS imulator"> | |
459 | <Opera tion>0</Op eration> | |
460 | </Platform > | |
461 | <Platform Name="iOSD evice32"> | |
462 | <Opera tion>0</Op eration> | |
463 | </Platform > | |
464 | </De ployClass> | |
465 | <Dep loyClass N ame="iPhon e_Launch64 0x1136"> | |
466 | <Platform Name="iOSD evice64"> | |
467 | <Opera tion>1</Op eration> | |
468 | </Platform > | |
469 | <Platform Name="iOSS imulator"> | |
470 | <Opera tion>1</Op eration> | |
471 | </Platform > | |
472 | <Platform Name="iOSD evice32"> | |
473 | <Opera tion>1</Op eration> | |
474 | </Platform > | |
475 | </De ployClass> | |
476 | <Dep loyClass N ame="Andro id_Launche rIcon36"> | |
477 | <Platform Name="Andr oid"> | |
478 | <Remot eDir>res\d rawable-ld pi</Remote Dir> | |
479 | <Opera tion>1</Op eration> | |
480 | </Platform > | |
481 | </De ployClass> | |
482 | <Dep loyClass N ame="Andro idSplashSt yles"> | |
483 | <Platform Name="Andr oid"> | |
484 | <Remot eDir>res\v alues</Rem oteDir> | |
485 | <Opera tion>1</Op eration> | |
486 | </Platform > | |
487 | </De ployClass> | |
488 | <Dep loyClass N ame="iPad_ Launch1536 "> | |
489 | <Platform Name="iOSD evice64"> | |
490 | <Opera tion>1</Op eration> | |
491 | </Platform > | |
492 | <Platform Name="iOSS imulator"> | |
493 | <Opera tion>1</Op eration> | |
494 | </Platform > | |
495 | <Platform Name="iOSD evice32"> | |
496 | <Opera tion>1</Op eration> | |
497 | </Platform > | |
498 | </De ployClass> | |
499 | <Dep loyClass N ame="Andro id_Launche rIcon48"> | |
500 | <Platform Name="Andr oid"> | |
501 | <Remot eDir>res\d rawable-md pi</Remote Dir> | |
502 | <Opera tion>1</Op eration> | |
503 | </Platform > | |
504 | </De ployClass> | |
505 | <Dep loyClass N ame="Andro id_Launche rIcon72"> | |
506 | <Platform Name="Andr oid"> | |
507 | <Remot eDir>res\d rawable-hd pi</Remote Dir> | |
508 | <Opera tion>1</Op eration> | |
509 | </Platform > | |
510 | </De ployClass> | |
511 | <Dep loyClass N ame="Proje ctAndroidM anifest"> | |
512 | <Platform Name="Andr oid"> | |
513 | <Opera tion>1</Op eration> | |
514 | </Platform > | |
515 | </De ployClass> | |
516 | <Pro jectRoot P latform="i OSDevice32 " Name="$( PROJECTNAM E).app"/> | |
517 | <Pro jectRoot P latform="A ndroid" Na me="$(PROJ ECTNAME)"/ > | |
518 | <Pro jectRoot P latform="W in32" Name ="$(PROJEC TNAME)"/> | |
519 | <Pro jectRoot P latform="i OSDevice64 " Name="$( PROJECTNAM E).app"/> | |
520 | <Pro jectRoot P latform="O SX32" Name ="$(PROJEC TNAME).app "/> | |
521 | <Pro jectRoot P latform="W in64" Name ="$(PROJEC TNAME)"/> | |
522 | <Pro jectRoot P latform="i OSSimulato r" Name="$ (PROJECTNA ME).app"/> | |
523 | </Deploy ment> | |
524 | <Platfor ms> | |
525 | <Pla tform valu e="Win32"> True</Plat form> | |
526 | <Pla tform valu e="Win64"> False</Pla tform> | |
527 | </Platfo rms> | |
528 | </ BorlandPro ject> | |
529 | <P rojectFile Version>12 </ProjectF ileVersion > | |
530 | </Proj ectExtensi ons> | |
531 | <Impor t Project= "$(BDS)\Bi n\CodeGear .Delphi.Ta rgets" Con dition="Ex ists('$(BD S)\Bin\Cod eGear.Delp hi.Targets ')"/> | |
532 | <Impor t Project= "$(APPDATA )\Embarcad ero\$(BDSA PPDATABASE DIR)\$(PRO DUCTVERSIO N)\UserToo ls.proj" C ondition=" Exists('$( APPDATA)\E mbarcadero \$(BDSAPPD ATABASEDIR )\$(PRODUC TVERSION)\ UserTools. proj')"/> | |
533 | <Impor t Project= "$(MSBuild ProjectNam e).deployp roj" Condi tion="Exis ts('$(MSBu ildProject Name).depl oyproj')"/ > | |
534 | </Project> |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.