Permalink
Browse files

Using latest lcVCS

  • Loading branch information...
montegoulding committed Mar 23, 2014
1 parent 37db4f0 commit 2650cf4893806cdb839e751bec7cccbef2f9aa4c
Showing with 1,054 additions and 181 deletions.
  1. +6 −1 .gitignore
  2. +17 −11 mergJSON.xcodeproj/project.pbxproj
  3. +16 −0 mergJSON/lcVCSProject.json
  4. +91 −0 mergJSON/mergJSON.livecode.vcs/10/d4502c-0466-4e65-a0d4-f7d033ccaef5/properties.json
  5. +9 −0 mergJSON/mergJSON.livecode.vcs/10/d4502c-0466-4e65-a0d4-f7d033ccaef5/script.utf8
  6. +87 −0 mergJSON/mergJSON.livecode.vcs/3E/8CA691-475F-42B2-A13A-DB745E5AFCAB/properties.json
  7. +87 −0 mergJSON/mergJSON.livecode.vcs/5B/B45A62-0917-4296-BE73-F8492AA2B0F8/properties.json
  8. +9 −0 mergJSON/mergJSON.livecode.vcs/5C/3ECC1C-2788-498D-A1CC-062FB0D91CF5/layers
  9. +38 −0 mergJSON/mergJSON.livecode.vcs/5C/3ECC1C-2788-498D-A1CC-062FB0D91CF5/properties.json
  10. +91 −0 mergJSON/mergJSON.livecode.vcs/86/53e971-ee37-43be-9e72-690895dc37a9/properties.json
  11. +11 −0 mergJSON/mergJSON.livecode.vcs/86/53e971-ee37-43be-9e72-690895dc37a9/script.utf8
  12. +91 −0 mergJSON/mergJSON.livecode.vcs/9f/58b393-ad3c-4de9-876b-97f8dffde4c7/properties.json
  13. +7 −0 mergJSON/mergJSON.livecode.vcs/9f/58b393-ad3c-4de9-876b-97f8dffde4c7/script.utf8
  14. +103 −0 mergJSON/mergJSON.livecode.vcs/C1/BFD4B1-CE40-48BD-8F85-A47130F12C4C/properties.json
  15. 0 ...0D91CF5/C1BFD4B1-CE40-48BD-8F85-A47130F12C4C → C1/BFD4B1-CE40-48BD-8F85-A47130F12C4C}/script.utf8
  16. +91 −0 mergJSON/mergJSON.livecode.vcs/C3/05E415-4BE6-45F8-92E1-A861550D7844/properties.json
  17. 0 ...0D91CF5/C305E415-4BE6-45F8-92E1-A861550D7844 → C3/05E415-4BE6-45F8-92E1-A861550D7844}/script.utf8
  18. +1 −0 mergJSON/mergJSON.livecode.vcs/F5/3B34CA-2443-4E91-8AD1-492336C3F706/cards
  19. +121 −0 mergJSON/mergJSON.livecode.vcs/F5/3B34CA-2443-4E91-8AD1-492336C3F706/properties.json
  20. 0 mergJSON/mergJSON.livecode.vcs/{ → F5/3B34CA-2443-4E91-8AD1-492336C3F706}/script.utf8
  21. +6 −0 mergJSON/mergJSON.livecode.vcs/F5/3B34CA-2443-4E91-8AD1-492336C3F706/userstate.json
  22. +91 −0 mergJSON/mergJSON.livecode.vcs/FA/87FEC5-6A35-4B24-8BA0-92D974F5132E/properties.json
  23. 0 ...0D91CF5/FA87FEC5-6A35-4B24-8BA0-92D974F5132E → FA/87FEC5-6A35-4B24-8BA0-92D974F5132E}/script.utf8
  24. +78 −5 ...CF5/FF98D9BE-39AF-44EC-9F61-A9A945414049 → FF/98D9BE-39AF-44EC-9F61-A9A945414049}/properties.json
  25. +2 −1 ...0D91CF5/FF98D9BE-39AF-44EC-9F61-A9A945414049 → FF/98D9BE-39AF-44EC-9F61-A9A945414049}/script.utf8
  26. +0 −27 ...s/cards/5C3ECC1C-2788-498D-A1CC-062FB0D91CF5/3E8CA691-475F-42B2-A13A-DB745E5AFCAB/properties.json
  27. +0 −27 ...s/cards/5C3ECC1C-2788-498D-A1CC-062FB0D91CF5/5BB45A62-0917-4296-BE73-F8492AA2B0F8/properties.json
  28. +0 −37 ...s/cards/5C3ECC1C-2788-498D-A1CC-062FB0D91CF5/C1BFD4B1-CE40-48BD-8F85-A47130F12C4C/properties.json
  29. +0 −20 ...s/cards/5C3ECC1C-2788-498D-A1CC-062FB0D91CF5/C305E415-4BE6-45F8-92E1-A861550D7844/properties.json
  30. +0 −20 ...s/cards/5C3ECC1C-2788-498D-A1CC-062FB0D91CF5/FA87FEC5-6A35-4B24-8BA0-92D974F5132E/properties.json
  31. +0 −18 mergJSON/mergJSON.livecode.vcs/cards/5C3ECC1C-2788-498D-A1CC-062FB0D91CF5/properties.json
  32. +1 −0 mergJSON/mergJSON.livecode.vcs/mainstack
  33. +0 −14 mergJSON/mergJSON.livecode.vcs/properties.json
View
@@ -26,4 +26,9 @@ DerivedData
*.dylib
binaries
_build
-build
+build
+buildlog.txt
+dual
+distribute
+*.tmp
+*.zip
@@ -213,9 +213,9 @@
productReference = B2662DBB17684D1100E9A174 /* libmergJSON.a */;
productType = "com.apple.product-type.library.static";
};
- B28F3C8C16B3F5E1009D2F35 /* mergJSON */ = {
+ B28F3C8C16B3F5E1009D2F35 /* mergJSON-OSX */ = {
isa = PBXNativeTarget;
- buildConfigurationList = B28F3C9B16B3F5E1009D2F35 /* Build configuration list for PBXNativeTarget "mergJSON" */;
+ buildConfigurationList = B28F3C9B16B3F5E1009D2F35 /* Build configuration list for PBXNativeTarget "mergJSON-OSX" */;
buildPhases = (
B28F3C8916B3F5E1009D2F35 /* Sources */,
B28F3C8A16B3F5E1009D2F35 /* Frameworks */,
@@ -226,7 +226,7 @@
);
dependencies = (
);
- name = mergJSON;
+ name = "mergJSON-OSX";
productName = mergJSON;
productReference = B28F3C8D16B3F5E1009D2F35 /* mergJSON.bundle */;
productType = "com.apple.product-type.bundle";
@@ -270,7 +270,7 @@
projectDirPath = "";
projectRoot = "";
targets = (
- B28F3C8C16B3F5E1009D2F35 /* mergJSON */,
+ B28F3C8C16B3F5E1009D2F35 /* mergJSON-OSX */,
B2662DBA17684D1100E9A174 /* mergJSON-iOS */,
B2B54CA2176EAD1C0047920A /* mergJSON-Server */,
);
@@ -300,7 +300,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "cp -r \"$BUILT_PRODUCTS_DIR/$EXECUTABLE_NAME.bundle\" \"$SRCROOT/binaries\"\ncp -r \"$BUILT_PRODUCTS_DIR/$EXECUTABLE_NAME.bundle\" \"/Users/montegoulding/Dropbox/LiveCode/Externals\"\nopen \"$SRCROOT/$EXECUTABLE_NAME/$EXECUTABLE_NAME.livecode\"";
+ shellScript = "cp -r \"$BUILT_PRODUCTS_DIR/$EXECUTABLE_NAME.bundle\" \"$SRCROOT/binaries\"\ncp -r \"$BUILT_PRODUCTS_DIR/$EXECUTABLE_NAME.bundle\" \"$SRCROOT/distribute\"\ncp -r \"$BUILT_PRODUCTS_DIR/$EXECUTABLE_NAME.bundle\" \"/Users/montegoulding/Dropbox/LiveCode/Externals\"\nopen \"$SRCROOT/$EXECUTABLE_NAME/$EXECUTABLE_NAME.livecode\"";
};
B2662DEE17684EBB00E9A174 /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
@@ -326,7 +326,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "cp \"$BUILT_PRODUCTS_DIR/$EXECUTABLE_NAME\" \"$SRCROOT/binaries/$EXECUTABLE_NAME\"";
+ shellScript = "cp \"$BUILT_PRODUCTS_DIR/$EXECUTABLE_NAME\" \"$SRCROOT/binaries/$EXECUTABLE_NAME\"\ncp \"$BUILT_PRODUCTS_DIR/$EXECUTABLE_NAME\" \"$SRCROOT/distribute\"\n";
};
/* End PBXShellScriptBuildPhase section */
@@ -447,7 +447,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
- ARCHS = "$(ARCHS_STANDARD_64_BIT)";
+ ARCHS = "$(ARCHS_STANDARD_32_BIT)";
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LIBRARY = "libc++";
CLANG_WARN_EMPTY_BODY = YES;
@@ -478,7 +478,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
- ARCHS = "$(ARCHS_STANDARD_64_BIT)";
+ ARCHS = "$(ARCHS_STANDARD_32_BIT)";
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LIBRARY = "libc++";
CLANG_WARN_EMPTY_BODY = YES;
@@ -506,12 +506,15 @@
COMBINE_HIDPI_IMAGES = YES;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "";
+ GCC_VERSION = com.apple.compilers.llvmgcc42;
HEADER_SEARCH_PATHS = /Users/montegoulding/jansson/src;
INFOPLIST_FILE = "mergJSON/mergJSON-Info.plist";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Bundles";
LIBRARY_SEARCH_PATHS = "$(inherited)";
MACOSX_DEPLOYMENT_TARGET = 10.4;
- PRODUCT_NAME = "$(TARGET_NAME)";
+ PRODUCT_NAME = mergJSON;
+ SDKROOT = macosx;
+ VALID_ARCHS = "i386 x86_64 ppc";
WRAPPER_EXTENSION = bundle;
};
name = Debug;
@@ -524,12 +527,15 @@
COMBINE_HIDPI_IMAGES = YES;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "";
+ GCC_VERSION = com.apple.compilers.llvmgcc42;
HEADER_SEARCH_PATHS = /Users/montegoulding/jansson/src;
INFOPLIST_FILE = "mergJSON/mergJSON-Info.plist";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Bundles";
LIBRARY_SEARCH_PATHS = "$(inherited)";
MACOSX_DEPLOYMENT_TARGET = 10.4;
- PRODUCT_NAME = "$(TARGET_NAME)";
+ PRODUCT_NAME = mergJSON;
+ SDKROOT = macosx;
+ VALID_ARCHS = "i386 x86_64 ppc";
WRAPPER_EXTENSION = bundle;
};
name = Release;
@@ -583,7 +589,7 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
- B28F3C9B16B3F5E1009D2F35 /* Build configuration list for PBXNativeTarget "mergJSON" */ = {
+ B28F3C9B16B3F5E1009D2F35 /* Build configuration list for PBXNativeTarget "mergJSON-OSX" */ = {
isa = XCConfigurationList;
buildConfigurations = (
B28F3C9C16B3F5E1009D2F35 /* Debug */,
View
@@ -0,0 +1,16 @@
+{
+ "build path": "",
+ "name": "mergJSON",
+ "plugins": [
+ "cRevGeneral",
+ "cREVGeometryCache",
+ "cRevStandaloneSettings",
+ "dataviewProps",
+ "dgProps",
+ "GLX2"
+ ],
+ "resource paths": "",
+ "stackFiles": [
+ "mergJSON.livecode"
+ ]
+}
@@ -0,0 +1,91 @@
+{
+ "UUID": "10d4502c-0466-4e65-a0d4-f7d033ccaef5",
+ "class": "com.runrev.engine.button",
+ "customPropertySets": {
+ "cREVGeneral": {
+ "revUniqueID": "1371258779249"
+ }
+ },
+ "properties": {
+ "accelKey": "",
+ "accelMods": "",
+ "accelText": "",
+ "altId": "0",
+ "armBorder": "true",
+ "armFill": "false",
+ "armedIcon": "0",
+ "autoArm": "false",
+ "autoHilite": "true",
+ "backColor": "",
+ "backPattern": "",
+ "behavior": "",
+ "blendLevel": "0",
+ "borderColor": "",
+ "borderPattern": "",
+ "borderWidth": "2",
+ "bottomColor": "",
+ "bottomPattern": "",
+ "cantSelect": "false",
+ "colorOverlay": "",
+ "default": "false",
+ "disabled": "false",
+ "disabledIcon": "0",
+ "dropShadow": "",
+ "family": "0",
+ "focusColor": "",
+ "focusPattern": "",
+ "foreColor": "",
+ "forePattern": "",
+ "hiliteBorder": "true",
+ "hiliteColor": "",
+ "hiliteFill": "true",
+ "hiliteIcon": "0",
+ "hilitePattern": "",
+ "hilited": "false",
+ "hoverIcon": "0",
+ "icon": "0",
+ "id": "1013",
+ "ink": "srcCopy",
+ "innerGlow": "",
+ "innerShadow": "",
+ "label": "",
+ "labelWidth": "0",
+ "layerMode": "static",
+ "lockLoc": "false",
+ "margins": "4",
+ "menuHistory": "1",
+ "menuLines": "5",
+ "menuMode": "",
+ "menuMouseButton": "1",
+ "menuName": "",
+ "mnemonic": "0",
+ "name": "Button",
+ "opaque": "true",
+ "outerGlow": "",
+ "rect": "2,4,84,27",
+ "shadow": "false",
+ "shadowColor": "",
+ "shadowOffset": "4",
+ "shadowPattern": "",
+ "sharedHilite": "true",
+ "showBorder": "true",
+ "showFocusBorder": "true",
+ "showHilite": "false",
+ "showIcon": "false",
+ "showName": "true",
+ "style": "standard",
+ "text": "",
+ "textAlign": "center",
+ "textFont": "",
+ "textSize": "",
+ "textStyle": "",
+ "threeD": "true",
+ "titleWidth": "0",
+ "toolTip": "",
+ "topColor": "",
+ "topPattern": "",
+ "traversalOn": "false",
+ "visible": "true",
+ "visitedIcon": "0"
+ }
+}
@@ -0,0 +1,9 @@
+on mouseUp
+ put the milliseconds into tSecs
+ put JSONToArray(the tests[random(6)] of btn "tests") into tArray
+ put the milliseconds-tSecs into tDecode
+ put the milliseconds into tSecs
+ put ArrayToJSON(tArray,the label of btn "force",the hilite of btn "pretty") into tJSON
+ put "decode:"&tDecode&&"encode:"&the milliseconds-tSecs
+ put tJSON into fld "out"
+end mouseUp
@@ -0,0 +1,87 @@
+{
+ "UUID": "3E8CA691-475F-42B2-A13A-DB745E5AFCAB",
+ "class": "com.runrev.engine.field",
+ "customPropertySets": {
+ "cREVGeneral": {
+ "revUniqueID": "1359318518158"
+ },
+ "cREVTable": {
+ "currentview": "Test Cases"
+ }
+ },
+ "properties": {
+ "altId": "0",
+ "autoHilite": "false",
+ "autoTab": "false",
+ "backColor": "",
+ "backPattern": "",
+ "behavior": "",
+ "blendLevel": "0",
+ "borderColor": "",
+ "borderPattern": "",
+ "borderWidth": "2",
+ "bottomColor": "",
+ "bottomPattern": "",
+ "cantSelect": "false",
+ "colorOverlay": "",
+ "disabled": "false",
+ "dontSearch": "false",
+ "dontWrap": "true",
+ "dropShadow": "",
+ "firstIndent": "0",
+ "fixedLineHeight": "true",
+ "focusColor": "",
+ "focusPattern": "",
+ "foreColor": "",
+ "forePattern": "",
+ "hGrid": "false",
+ "hScroll": "0",
+ "hScrollbar": "false",
+ "hiliteColor": "",
+ "hilitePattern": "",
+ "hilitedLines": "",
+ "htmlText": "<p>{</p>\n<p> \"menu\": {</p>\n<p> \"id\": \"file\",</p>\n<p> \"popup\": {</p>\n<p> \"menuitem\": [</p>\n<p> {</p>\n<p> \"onclick\": \"CreateNewDoc()\",</p>\n<p> \"value\": \"New\"</p>\n<p> },</p>\n<p> {</p>\n<p> \"onclick\": \"OpenDoc()\",</p>\n<p> \"value\": \"Open\"</p>\n<p> },</p>\n<p> {</p>\n<p> \"onclick\": \"CloseDoc()\",</p>\n<p> \"value\": \"Close\"</p>\n<p> }</p>\n<p> ]</p>\n<p> },</p>\n<p> \"value\": \"File\"</p>\n<p> }</p>\n<p>}</p>",
+ "id": "1004",
+ "ink": "srcCopy",
+ "innerGlow": "",
+ "innerShadow": "",
+ "layerMode": "static",
+ "listBehavior": "false",
+ "lockLoc": "false",
+ "lockText": "true",
+ "margins": "8",
+ "multipleHilites": "false",
+ "name": "Label Field",
+ "noncontiguousHilites": "false",
+ "opaque": "false",
+ "outerGlow": "",
+ "rect": "0,4,100,25",
+ "scrollbarWidth": "20",
+ "shadow": "false",
+ "shadowColor": "",
+ "shadowOffset": "4",
+ "shadowPattern": "",
+ "sharedText": "true",
+ "showBorder": "false",
+ "showFocusBorder": "true",
+ "showLines": "false",
+ "style": "transparent",
+ "tabStops": "",
+ "textAlign": "right",
+ "textFont": "",
+ "textHeight": "",
+ "textSize": "",
+ "textStyle": "",
+ "threeD": "true",
+ "threeDHilite": "false",
+ "toggleHilites": "false",
+ "toolTip": "",
+ "topColor": "",
+ "topPattern": "",
+ "traversalOn": "false",
+ "vGrid": "false",
+ "vScroll": "0",
+ "vScrollbar": "false",
+ "visible": "true"
+ }
+}
Oops, something went wrong.

0 comments on commit 2650cf4

Please sign in to comment.