Check-in [e0da51283c]

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Update to handle [632b9cc629]
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:e0da51283c4b741df9758bb5fb5752b4cd9db50b
User & Date: jim 2012-08-11 11:27:41
References
2012-08-11
11:28 Verified ticket [632b9cc629]: Found new key sourcecode.objj.h for H files plus 4 other changes artifact: a575ca08f1 user: jim
Context
2012-10-12
16:19
Fix to put options at the end [[b43daab457] check-in: 8a6eff5535 user: jim tags: trunk
2012-08-11
11:27
Update to handle [632b9cc629] check-in: e0da51283c user: jim tags: trunk
2012-07-23
14:46
Add -linker to command line 6519ea274e check-in: 52cac69aea user: jim tags: trunk
Changes

Changes to CMaker.cp.

64
65
66
67
68
69
70

71
72
73
74
75
76
77
...
458
459
460
461
462
463
464
465
466

467
468
469
470
471
472
473
...
502
503
504
505
506
507
508

509
510
511

512
513
514
515
516
517
518
519
520
521

522
523
524
525
526
527
528
*									obj list and main C compile			*
*	2.8		 7-Dec-2006	J.Schimpf	Change parse() to check for non		*
*									null target before looking at		*
*									string								*
*	2.9		 7-Sep-2008	J.Schimpf	Add obj.c type to sources in		*
*									gatherline							*
*	2.10	23-Jul-2012	J.Schimpf	Add linker cmd option 6519ea274e	*

*																		*
*	DESCRIPTION:													    *
*		This class takes as input a open write file (makefile) and		*
*	a PBXPROJ structure and uses this to build a make file for the proj	*
*			(1) Scan to find PBXFileReference section					*
*				(a) Read {....} section and pull out KVP's				*
*				(b) Store .c files & paths in FILES						*
................................................................................
						"sourcecode.c.c",
						"sourcecode.cpp.cpp",
						"sourcecode.c.h",
						"compiled.mach-o.executable",
						"wrapper.framework",
						"archive",				// REF:JS12032006
						"archive.ar",
						"compiled.mach-o.dylib"	// REF:JS10102006 Add dynamic lib
						"sourcecode.c.objc"		// REF:JS07092008 Add obj c

					};
					
	int vlen = (sizeof(values)/sizeof(char *));

	const char *sources[] = {
						(char *)"SOURCE_ROOT",
						(char *)"<absolute>",
................................................................................
						break;
						
		case 2:
		case 3:
						// File type, determine what type we have
						for(j=0; j<vlen; j++ )
						{

							if( strcmp(kvp.value,values[j]) == 0 )
								break;
						}

						switch( j )
						{
							case 0:			
							case 1:	
							case 8:			// REF:JS078092008 Add OBJ c files
											// Source files just mark that we found it
											line.file_type = true;
											line.type = SOURCE_FILE;
											break;
							

							case 2:			// Mark that we found source file and
											// that it's an include file
											line.file_type = true;
											line.type = INCLUDE_FILE;
											break;
											
							case 3:			// EXE file, mark and save







>







 







|
|
>







 







>



>










>







64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
...
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
...
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
*									obj list and main C compile			*
*	2.8		 7-Dec-2006	J.Schimpf	Change parse() to check for non		*
*									null target before looking at		*
*									string								*
*	2.9		 7-Sep-2008	J.Schimpf	Add obj.c type to sources in		*
*									gatherline							*
*	2.10	23-Jul-2012	J.Schimpf	Add linker cmd option 6519ea274e	*
*	2.11	11-Aug-2012 J.Schimpf	New H file marker [632b9cc629]		*
*																		*
*	DESCRIPTION:													    *
*		This class takes as input a open write file (makefile) and		*
*	a PBXPROJ structure and uses this to build a make file for the proj	*
*			(1) Scan to find PBXFileReference section					*
*				(a) Read {....} section and pull out KVP's				*
*				(b) Store .c files & paths in FILES						*
................................................................................
						"sourcecode.c.c",
						"sourcecode.cpp.cpp",
						"sourcecode.c.h",
						"compiled.mach-o.executable",
						"wrapper.framework",
						"archive",				// REF:JS12032006
						"archive.ar",
						"compiled.mach-o.dylib",	// REF:JS10102006 Add dynamic lib
						"sourcecode.c.objc",		// REF:JS07092008 Add obj c
						"sourcecode.objj.h"			// New H file designation [632b9cc629]
					};
					
	int vlen = (sizeof(values)/sizeof(char *));

	const char *sources[] = {
						(char *)"SOURCE_ROOT",
						(char *)"<absolute>",
................................................................................
						break;
						
		case 2:
		case 3:
						// File type, determine what type we have
						for(j=0; j<vlen; j++ )
						{
							
							if( strcmp(kvp.value,values[j]) == 0 )
								break;
						}
						
						switch( j )
						{
							case 0:			
							case 1:	
							case 8:			// REF:JS078092008 Add OBJ c files
											// Source files just mark that we found it
											line.file_type = true;
											line.type = SOURCE_FILE;
											break;
							
							case 9:			// [632b9cc629] New hfile designation
							case 2:			// Mark that we found source file and
											// that it's an include file
											line.file_type = true;
											line.type = INCLUDE_FILE;
											break;
											
							case 3:			// EXE file, mark and save

Changes to pbtomake.xcodeproj/project.xcworkspace/xcuserdata/jim.xcuserdatad/UserInterfaceState.xcuserstate.

cannot compute difference between binary files

Changes to pbtomake.xcodeproj/xcuserdata/jim.xcuserdatad/xcdebugger/Breakpoints.xcbkptlist.

26
27
28
29
30
31
32


























33
34
         startingColumnNumber = "9223372036854775807"
         endingColumnNumber = "9223372036854775807"
         startingLineNumber = "211"
         endingLineNumber = "211"
         landmarkName = "main(int argc,char **argv)"
         landmarkType = "7">
      </FileBreakpoint>


























   </FileBreakpoints>
</Bucket>







>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>


26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
         startingColumnNumber = "9223372036854775807"
         endingColumnNumber = "9223372036854775807"
         startingLineNumber = "211"
         endingLineNumber = "211"
         landmarkName = "main(int argc,char **argv)"
         landmarkType = "7">
      </FileBreakpoint>
      <FileBreakpoint
         shouldBeEnabled = "No"
         ignoreCount = "0"
         continueAfterRunningActions = "No"
         filePath = "CMaker.cp"
         timestampString = "366375303.828747"
         startingColumnNumber = "9223372036854775807"
         endingColumnNumber = "9223372036854775807"
         startingLineNumber = "250"
         endingLineNumber = "250"
         landmarkName = "CMaker::parse()"
         landmarkType = "5">
      </FileBreakpoint>
      <FileBreakpoint
         shouldBeEnabled = "No"
         ignoreCount = "0"
         continueAfterRunningActions = "No"
         filePath = "CMaker.cp"
         timestampString = "366375356.123819"
         startingColumnNumber = "9223372036854775807"
         endingColumnNumber = "9223372036854775807"
         startingLineNumber = "422"
         endingLineNumber = "422"
         landmarkName = "CMaker::parseline(int type,char *token)"
         landmarkType = "5">
      </FileBreakpoint>
   </FileBreakpoints>
</Bucket>

Changes to pbtomake.xcodeproj/xcuserdata/jim.xcuserdatad/xcschemes/pbtomake.xcscheme.

46
47
48
49
50
51
52




53
54
55
56
57
58
59
60
61
            BuildableName = "pbtomake"
            BlueprintName = "pbtomake"
            ReferencedContainer = "container:pbtomake.xcodeproj">
         </BuildableReference>
      </BuildableProductRunnable>
      <CommandLineArguments>
         <CommandLineArgument




            argument = "-i BoardCom.xcodeproj -obj obj -cc g++ -cc_opt -D_cplusplus=1 -linker clang++"
            isEnabled = "YES">
         </CommandLineArgument>
         <CommandLineArgument
            argument = "-i ../../TEST/Firenet.xcodeproj -obj obj"
            isEnabled = "NO">
         </CommandLineArgument>
      </CommandLineArguments>
      <AdditionalOptions>







>
>
>
>

|







46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
            BuildableName = "pbtomake"
            BlueprintName = "pbtomake"
            ReferencedContainer = "container:pbtomake.xcodeproj">
         </BuildableReference>
      </BuildableProductRunnable>
      <CommandLineArguments>
         <CommandLineArgument
            argument = "-i HIDAPI_TEST.xcodeproj -debug"
            isEnabled = "YES">
         </CommandLineArgument>
         <CommandLineArgument
            argument = "-i BoardCom.xcodeproj -obj obj -cc g++ -cc_opt -D_cplusplus=1 -linker clang++"
            isEnabled = "NO">
         </CommandLineArgument>
         <CommandLineArgument
            argument = "-i ../../TEST/Firenet.xcodeproj -obj obj"
            isEnabled = "NO">
         </CommandLineArgument>
      </CommandLineArguments>
      <AdditionalOptions>