Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
timpokorny committed Jan 26, 2016
2 parents 3bdfea4 + 484f4b9 commit 40de937
Show file tree
Hide file tree
Showing 37 changed files with 3,099 additions and 374 deletions.
8 changes: 8 additions & 0 deletions codebase/build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,9 @@
<delete dir="${dist.dir}"/>
</target>

<!-- ============================================================ -->
<!-- Extension Targets - Variations and extenions on public ones -->
<!-- ============================================================ -->
<!-- Set the flag that says this is a release build. Usually used to control
whether we execute time-intensive tasks that aren't necessary for testing
such as the generation of API docs, etc... -->
Expand All @@ -122,4 +125,9 @@
<property name="build.release" value="true"/>
</target>

<!-- Do a complete sandbox build, jre included -->
<target name="sandbox.full"
description="Build a complete sandbox, JRE included"
depends="master.sandbox,java.sandbox.jre"/>

</project>
2 changes: 1 addition & 1 deletion codebase/profiles/system.macros.xml
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@
<copy todir="@{todir}/jre"><fileset dir="${_jdkpath}/jre"/></copy>
</then>
<else>
<exec executable="cp" dir="@{jre.dir}" failonerror="true">
<exec executable="cp" failonerror="true">
<arg line="-Rfp ${_jdkpath}/jre @{todir}/"/>
</exec>
</else></if>
Expand Down
2 changes: 2 additions & 0 deletions codebase/profiles/windows/installer.xml
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
<!-- run the NSIS script for the installer -->
<echo>Creating Windows 32-bit Installer</echo>
<nsis-installer script="${nsis.resources.dir}/installer-win32.nsi">
<define name="DIST_NAME" value="${dist.name}"/> <!-- start of file name -->
<define name="OUTDIR" value="${dist.dir}"/> <!-- put the installer here -->
<define name="VERSION" value="${build.version}"/> <!-- e.g. "2.0.0" -->
<define name="BUILD_NUMBER" value="${build.number}"/> <!-- shown in file details -->
Expand All @@ -68,6 +69,7 @@
<!-- run the NSIS script for the installer -->
<echo>Creating Windows 64-bit Installer</echo>
<nsis-installer script="${nsis.resources.dir}/installer-win64.nsi">
<define name="DIST_NAME" value="${dist.name}"/> <!-- start of file name -->
<define name="OUTDIR" value="${dist.dir}"/> <!-- put installer here -->
<define name="VERSION" value="${build.version}"/> <!-- e.g. "2.0.0" -->
<define name="BUILD_NUMBER" value="${build.number}"/> <!-- shown in file details -->
Expand Down
34 changes: 34 additions & 0 deletions codebase/resources/dist/common/Changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,40 @@ or the GitHub pull-request number for community-sourced updates.
* (`#XYZ`) -- GitHub pull request number, see `https://github.com/openlvc/portico/pull`


v2.0.2 / 2015-12-31
--------------------

#### Notes

* `note` Bundled JRE version has been updated to `1.8.0_66`

#### Improvements

* `improve` Fixed a problem that made Portico difficult to use in private Maven repos.
This would manifest as extremely long startup time as a large number of
non-Portico related jar files were unnecessarily scanned. (`#148`)

* `improve` Added ability to generate a sandbox that includes a JRE by calling the
`sandbox.full` target. This is useful when building from source for use
with `RTI_HOME` directly set to the sandbox directory. (`#130`)

#### Bug Fixes

* `bugfix` Fixed a bug that would cause the truncation of values for large attribute
reflections or parameters sent. If a value of an individual attributes or
parameter was >`989b`, all values after the 989th byte were being trucated
to `0`. (#65)

* `bugfix` Fixed a problem preventing use of Portico with time managed federates
generated by Pitch Developer Studio (`#41`)

* `bugfix` Fixed a problem where calling `tick(min_time,max_time)` would not tick
for at least `min_time` if there were messages waiting for processing.
(`#53`)

* `bugfix` Fixed a problem with `IEEE-1516e` Java interface referencing wrong
`LogicalTimeFactory` implementation with Integer-based times. (`#142`)

v2.0.1 / 2014-10-22
--------------------

Expand Down
152 changes: 152 additions & 0 deletions codebase/resources/documentation/markdown/mou-changelog-stylesheet.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,152 @@
@import url(http://fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,600italic,700italic,800italic,400,300,600,700,800);
@import url(http://fonts.googleapis.com/css?family=Inconsolata:400,700);

h1,
h2,
h3,
h4,
h5,
h6,
p,
blockquote {
margin: 0;
padding: 0;
}
body {
font-family: "Open Sans", Calibri, "Helvetica Neue", Helvetica, "Hiragino Sans GB", Arial, sans-serif;
font-size: 13px;
line-height: 18px;
color: #737373;
background-color: white;
margin: 10px 13px 10px 13px;
}
table {
margin: 10px 0 15px 0;
border-collapse: collapse;
}
td,th {
border: 1px solid #ddd;
padding: 3px 10px;
}
th {
padding: 5px 10px;
}

a {
color: #0069d6;
}
a:hover {
color: #0050a3;
text-decoration: none;
}
a img {
border: none;
}
p {
margin-bottom: 9px;
}
h1,
h2,
h3,
h4,
h5,
h6 {
color: #404040;
line-height: 36px;
}
h1 {
margin-bottom: 18px;
font-size: 30px;
}
h2 {
font-size: 24px;
border-bottom: 1px solid #cccccc;
}
h3 {
font-size: 18px;
}
h4 {
font-size: 16px;
}
h5 {
font-size: 14px;
}
h6 {
font-size: 13px;
}
hr {
margin: 0 0 19px;
border: 0;
border-bottom: 1px solid #ccc;
}
blockquote {
padding: 13px 13px 21px 15px;
margin-bottom: 18px;
font-family:georgia,serif;
font-style: italic;
}
blockquote:before {
content:"\201C";
font-size:40px;
margin-left:-10px;
font-family:georgia,serif;
color:#eee;
}
blockquote p {
font-size: 14px;
font-weight: 300;
line-height: 18px;
margin-bottom: 0;
font-style: italic;
}
code, pre {
font-family: Monaco, Andale Mono, Courier New, monospace;
}
code {
background-color: #f8f8cc;
color: rgba(0, 0, 0, 0.75);
padding: 1px 3px;
font-size: 12px;
-webkit-border-radius: 3px;
-moz-border-radius: 3px;
border-radius: 3px;
}
pre {
display: block;
padding: 14px;
margin: 0 0 18px;
line-height: 16px;
font-size: 11px;
border: 1px solid #d9d9d9;
white-space: pre-wrap;
word-wrap: break-word;
}
pre code {
background-color: #fff;
color:#737373;
font-size: 11px;
padding: 0;
}
sup {
font-size: 0.83em;
vertical-align: super;
line-height: 0;
}
* {
-webkit-print-color-adjust: exact;
}
@media screen and (min-width: 914px) {
body {
width: 854px;
margin:10px auto;
}
}
@media print {
body,code,pre code,h1,h2,h3,h4,h5,h6 {
color: black;
}
table, pre {
page-break-inside: avoid;
}
}

Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,10 @@

;Name and file
Name "Portico v${VERSION} (32-bit)"
OutFile "${OUTDIR}\portico-${VERSION}-win32.exe"
OutFile "${OUTDIR}\${DIST_NAME}-${VERSION}-win32.exe"

;Use something a little stronger
SetCompressor /SOLID lzma

;Default installation folder
InstallDir "$PROGRAMFILES32\Portico\portico-${VERSION}"
Expand All @@ -36,7 +39,7 @@
VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductName" "Portico"
VIAddVersionKey /LANG=${LANG_ENGLISH} "Comments" "The Portico Open Source RTI"
VIAddVersionKey /LANG=${LANG_ENGLISH} "CompanyName" "Calytrix Technologies"
VIAddVersionKey /LANG=${LANG_ENGLISH} "LegalCopyright" "Calytrix Technologies"
VIAddVersionKey /LANG=${LANG_ENGLISH} "LegalCopyright" "The Portico Project"
VIAddVersionKey /LANG=${LANG_ENGLISH} "FileDescription" "Portico Installer"
VIAddVersionKey /LANG=${LANG_ENGLISH} "FileVersion" "${VERSION}.${BUILD_NUMBER}"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,10 @@

;Name and file
Name "Portico v${VERSION} (64-bit)"
OutFile "${OUTDIR}\portico-${VERSION}-win64.exe"
OutFile "${OUTDIR}\${DIST_NAME}-${VERSION}-win64.exe"

;Use something a little stronger
SetCompressor /SOLID lzma

;Default installation folder
InstallDir "$PROGRAMFILES64\Portico\portico-${VERSION}"
Expand All @@ -36,7 +39,7 @@
VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductName" "Portico"
VIAddVersionKey /LANG=${LANG_ENGLISH} "Comments" "The Portico Open Source RTI"
VIAddVersionKey /LANG=${LANG_ENGLISH} "CompanyName" "Calytrix Technologies"
VIAddVersionKey /LANG=${LANG_ENGLISH} "LegalCopyright" "Calytrix Technologies"
VIAddVersionKey /LANG=${LANG_ENGLISH} "LegalCopyright" "The Portico Project"
VIAddVersionKey /LANG=${LANG_ENGLISH} "FileDescription" "Portico Installer"
VIAddVersionKey /LANG=${LANG_ENGLISH} "FileVersion" "${VERSION}.${BUILD_NUMBER}"

Expand Down
Loading

0 comments on commit 40de937

Please sign in to comment.