Warning! We have ended support for Kiln Harmony. We will continue to support Mercurial and Git repositories individually, but not both at the same time.
Please convert this repository to either a Mercurial or Git repository. To do so, have an Admin go to Settings, then click "Convert Repository to Git-only or Mercurial-only", and follow the instructions there.
Alternatively, you can see a list of all Harmony repos, and convert many at once here.
If you have any questions or concerns, please contact us at customer-service@fogcreek.com.
tip
develop
Merge branch 'hotfix-serial-plugin' into develop
Conflicts:
.travis.yml
README.md
mc/VMMaker-oscog.package/monticello.meta/version
by
Changes to 13 files · Browse files at 1ebef757b586 Showing diff from parent b8a669f711d2 9350e9358257 Diff from another changeset...
-
.travis.yml
-
README.md
-
build.sh
-
image/newImage.sh
-
mc/VMMaker-oscog.package/CCodeGenerator.class/methodProperties.json
-
mc/VMMaker-oscog.package/SerialPlugin.class/instance/primitiveSerialPortOpenByName.baudRate.stopBitsType.parityType.dataBits.inFlowControlType.outFlowControlType.xOnByte.xOffByte..st
-
mc/VMMaker-oscog.package/SerialPlugin.class/instance/primitiveSerialPortReadByName.into.startingAt.count..st
-
mc/VMMaker-oscog.package/SerialPlugin.class/instance/primitiveSerialPortWriteByName.from.startingAt.count..st
-
mc/VMMaker-oscog.package/SerialPlugin.class/methodProperties.json
-
mc/VMMaker-oscog.package/TAssignmentNode.class/methodProperties.json
-
mc/VMMaker-oscog.package/TParseNode.class/methodProperties.json
-
mc/VMMaker-oscog.package/TSendNode.class/methodProperties.json
-
mc/VMMaker-oscog.package/monticello.meta/version
|
@@ -3,11 +3,11 @@ install:
- sudo apt-get update
- sudo apt-get install cmake zip bash-completion ruby git xz-utils debhelper devscripts
- - sudo apt-get install libc6-dev:i386 libasound2-dev:i386 libssl-dev:i386 libfreetype6-dev:i386 libx11-dev:i386 libsm-dev:i386 libice-dev:i386
+ - sudo apt-get install libc6-dev:i386 libasound2-dev:i386 libssl-dev:i386 libssl0.9.8:i386 libfreetype6-dev:i386 libx11-dev:i386 libsm-dev:i386 libice-dev:i386
- sudo apt-get install build-essential gcc-multilib g++
# due to https://bugs.launchpad.net/ubuntu/+source/mesa/+bug/949606 we cannot directly install libgl1-mesa-dev:i386
- sudo apt-get install libgl1-mesa-dev libgl1-mesa-glx:i386
- sudo ln -s /usr/lib/i386-linux-gnu/mesa/libGL.so /usr/lib/i386-linux-gnu/libGL.so
- sudo ln -s /usr/lib/i386-linux-gnu/mesa/libGL.so.1 /usr/lib/i386-linux-gnu/mesa/libGL.so
script:
- - ./build.sh
\ No newline at end of file+ - ./build.sh
|
||
|
@@ -1,3 +1,8 @@ + Build Status
+============
+- Master Branch: [](https://travis-ci.org/pharo-project/pharo-vm)
+- Develop Branch: [](https://travis-ci.org/pharo-project/pharo-vm)
+
REQUIREMENTS
============
|
||
|
Change 1 of 3
Show Entire File
mc/VMMaker-oscog.package/CCodeGenerator.class/methodProperties.json
Stacked
|
||
|---|---|---|
|
@@ -45,7 +45,7 @@ "emitCAPIExportHeaderOn:" : "eem 8/21/2013 13:01",
"emitCCodeOn:doInlining:doAssertions:" : "eem 5/20/2010 17:14",
"emitCConstantsOn:" : "eem 12/14/2012 12:11",
- "emitCExpression:on:" : " 2/7/08 14:57",
+ "emitCExpression:on:" : "2/7/08 14:57",
"emitCFunctionPrototypes:on:" : "eem 11/2/2010 14:18",
"emitCHeaderOn:" : "eem 7/16/2013 13:40",
"emitCMacros:on:" : "eem 2/14/2009 09:14",
@@ -91,9 +91,9 @@ "generateGreaterThan:on:indent:" : "",
"generateGreaterThanOrEqual:on:indent:" : "",
"generateIfFalse:on:indent:" : "eem 8/6/2011 19:35",
- "generateIfFalseAsArgument:on:indent:" : " 2/7/08 14:57",
- "generateIfFalseIfTrue:on:indent:" : " 2/7/08 14:57",
- "generateIfFalseIfTrueAsArgument:on:indent:" : " 2/7/08 14:57",
+ "generateIfFalseAsArgument:on:indent:" : "2/7/08 14:57",
+ "generateIfFalseIfTrue:on:indent:" : "2/7/08 14:57",
+ "generateIfFalseIfTrueAsArgument:on:indent:" : "2/7/08 14:57",
"generateIfNil:on:indent:" : "eem 10/27/2010 12:28",
"generateIfNilAsArgument:on:indent:" : "eem 10/27/2010 12:29",
"generateIfNilIfNotNil:on:indent:" : "eem 10/27/2010 12:27",
@@ -102,9 +102,9 @@ "generateIfNotNilAsArgument:on:indent:" : "eem 10/27/2010 12:25",
"generateIfNotNilIfNil:on:indent:" : "eem 10/27/2010 12:28",
"generateIfNotNilIfNilAsArgument:on:indent:" : "eem 10/27/2010 12:32",
- "generateIfTrue:on:indent:" : " 2/7/08 14:57",
- "generateIfTrueAsArgument:on:indent:" : " 2/7/08 14:57",
- "generateIfTrueIfFalse:on:indent:" : " 2/7/08 14:57",
+ "generateIfTrue:on:indent:" : "2/7/08 14:57",
+ "generateIfTrueAsArgument:on:indent:" : "2/7/08 14:57",
+ "generateIfTrueIfFalse:on:indent:" : "2/7/08 14:57",
"generateIfTrueIfFalseAsArgument:on:indent:" : "eem 10/9/2010 17:07",
"generateInlineCCode:on:indent:" : "eem 2/21/2011 14:23",
"generateInlineCCodeAsArgument:on:indent:" : "eem 2/21/2011 14:24",
|
||
|
@@ -8,7 +8,7 @@ parameters: #(String SmallInteger SmallInteger SmallInteger SmallInteger SmallInteger SmallInteger SmallInteger SmallInteger ).
portNameSize := interpreterProxy slotSizeOf: (portName asOop: String).
- port := self cCode: 'calloc(portNameSize, sizeof(char))'.
+ port := self cCode: 'calloc(portNameSize+1, sizeof(char))'.
self cCode: 'memcpy(port, portName, portNameSize)'.
self cCode: 'serialPortOpenByName(
|
||
|
@@ -5,13 +5,13 @@ | port portNameSize bytesRead arrayPtr |
self primitive: 'primitiveSerialPortReadByName'
- parameters: #(String ByteArray SmallInteger SmallInteger ).
+ parameters: #(String ByteArray SmallInteger SmallInteger ).
interpreterProxy success: (startIndex >= 1 and: [startIndex + count - 1 <= (interpreterProxy byteSizeOf: array cPtrAsOop)]).
"adjust for zero-origin indexing"
portNameSize := interpreterProxy slotSizeOf: (portName asOop: String).
- port := self cCode: 'calloc(portNameSize, sizeof(char))'.
+ port := self cCode: 'calloc(portNameSize+1, sizeof(char))'.
self cCode: 'memcpy(port, portName, portNameSize)'.
arrayPtr := array asInteger + startIndex - 1.
|
||
|
@@ -8,7 +8,7 @@ parameters: #(String ByteArray SmallInteger SmallInteger ).
portNameSize := interpreterProxy slotSizeOf: (portName asOop: String).
- port := self cCode: 'calloc(portNameSize, sizeof(char))'.
+ port := self cCode: 'calloc(portNameSize+1, sizeof(char))'.
self cCode: 'memcpy(port, portName, portNameSize)'.
interpreterProxy success: (startIndex >= 1 and: [startIndex + count - 1 <= (interpreterProxy byteSizeOf: array cPtrAsOop)]).
|
||
|
Change 1 of 1
Show Entire File
mc/VMMaker-oscog.package/SerialPlugin.class/methodProperties.json
Stacked
|
||
|---|---|---|
|
@@ -6,9 +6,9 @@ "initialiseModule" : "ar (auto pragmas 12/08) 5/12/2000 16:53",
"primitiveSerialPortClose:" : "TPR 2/17/2000 18:16",
"primitiveSerialPortOpen:baudRate:stopBitsType:parityType:dataBits:inFlowControlType:outFlowControlType:xOnByte:xOffByte:" : "TPR 2/11/2000 16:08",
- "primitiveSerialPortOpenByName:baudRate:stopBitsType:parityType:dataBits:inFlowControlType:outFlowControlType:xOnByte:xOffByte:" : "LucFabresse 1/16/2013 18:29",
+ "primitiveSerialPortOpenByName:baudRate:stopBitsType:parityType:dataBits:inFlowControlType:outFlowControlType:xOnByte:xOffByte:" : "LucFabresse 9/26/2013 17:06",
"primitiveSerialPortRead:into:startingAt:count:" : "tpr 12/30/2005 15:52",
- "primitiveSerialPortReadByName:into:startingAt:count:" : "EstebanLorenzano 11/2/2012 13:38",
+ "primitiveSerialPortReadByName:into:startingAt:count:" : "LucFabresse 9/26/2013 17:26",
"primitiveSerialPortWrite:from:startingAt:count:" : "TPR 3/21/2000 17:00",
- "primitiveSerialPortWriteByName:from:startingAt:count:" : "EstebanLorenzano 11/2/2012 13:38",
+ "primitiveSerialPortWriteByName:from:startingAt:count:" : "LucFabresse 9/26/2013 17:06",
"shutdownModule" : "ar (auto pragmas 12/08) 5/12/2000 16:55" } }
|
||
|
Change 1 of 1
Show Entire File
mc/VMMaker-oscog.package/TAssignmentNode.class/methodProperties.json
Stacked
|
||
|---|---|---|
|
@@ -6,7 +6,7 @@ "bindVariableUsesIn:andConstantFoldIf:in:" : "eem 10/29/2012 11:38",
"bindVariablesIn:" : "",
"emitCCodeAsArgumentOn:level:generator:" : "eem 6/28/2011 10:57",
- "emitCCodeAsExpressionOn:level:generator:" : " 2/7/08 14:57",
+ "emitCCodeAsExpressionOn:level:generator:" : "2/7/08 14:57",
"emitCCodeOn:level:generator:" : "eem 6/24/2012 16:18",
"emitLiteralArrayDeclarationOn:level:generator:" : "eem 6/29/2012 16:23",
"expression" : "",
|
||
|
Change 1 of 1
Show Entire File
mc/VMMaker-oscog.package/TParseNode.class/methodProperties.json
Stacked
|
||
|---|---|---|
|
@@ -13,8 +13,8 @@ "comment:" : "hg 8/14/2000 15:32",
"detect:" : "eem 8/13/2012 15:35",
"detect:ifNone:" : "eem 8/13/2012 15:34",
- "emitCCodeAsArgumentOn:level:generator:" : " 2/7/08 14:57",
- "emitCCodeAsExpressionOn:level:generator:" : " 2/7/08 14:57",
+ "emitCCodeAsArgumentOn:level:generator:" : "2/7/08 14:57",
+ "emitCCodeAsExpressionOn:level:generator:" : "2/7/08 14:57",
"emitCCodeOn:level:generator:" : "nk 4/5/2005 21:02",
"emitCCodeOn:prependToEnd:level:generator:" : "eem 10/30/2012 16:02",
"emitCCommentOn:level:" : "GuillermoPolito 6/17/2013 12:14",
|
||
|
Change 1 of 1
Show Entire File
mc/VMMaker-oscog.package/TSendNode.class/methodProperties.json
Stacked
|
||
|---|---|---|
|
@@ -9,7 +9,7 @@ "bindVariableUsesIn:andConstantFoldIf:in:" : "eem 7/19/2013 10:33",
"bindVariablesIn:" : "",
"emitCCodeAsArgumentOn:level:generator:" : "eem 12/11/2010 12:39",
- "emitCCodeAsExpressionOn:level:generator:" : " 2/7/08 14:57",
+ "emitCCodeAsExpressionOn:level:generator:" : "2/7/08 14:57",
"emitCCodeAsFieldReferenceOn:level:generator:" : "eem 12/11/2010 12:39",
"emitCCodeAsFunctionCallOn:level:generator:" : "eem 12/6/2012 12:47",
"emitCCodeOn:level:generator:" : "eem 12/11/2010 12:39",
|
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
Add a tag
Loading...