Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
689f562
expanded references.
ctalau Oct 28, 2015
701f7ac
Create .travis.yml
ctalau May 5, 2016
c4d11e6
Update .travis.yml
ctalau May 5, 2016
bf97701
Update .travis.yml
ctalau May 5, 2016
e0f8d64
Create README.md
ctalau May 5, 2016
b69b5e6
Update .travis.yml
ctalau May 5, 2016
bf1f5fa
Update .travis.yml
ctalau May 5, 2016
469ff0e
Update .travis.yml
ctalau May 5, 2016
8b91a92
Update README.md
ctalau May 5, 2016
2b146fa
Update keydefs.ditamap
ctalau May 5, 2016
b54ea9c
Update .travis.yml
ctalau May 5, 2016
79459a2
Update .travis.yml
ctalau May 5, 2016
364fe7d
Update keydefs.ditamap
ctalau May 5, 2016
697928c
Update .travis.yml
ctalau May 5, 2016
e721886
Update .travis.yml
ctalau May 5, 2016
94b449f
Update .travis.yml
ctalau May 5, 2016
a125768
Update .travis.yml
ctalau May 6, 2016
ff12b53
Update .travis.yml
ctalau May 6, 2016
2bc4bcf
Added the license file
May 6, 2016
5c5645d
Update .travis.yml
ctalau May 6, 2016
bd97d0d
Update .travis.yml
ctalau May 6, 2016
8f53ff0
smth
May 6, 2016
716f0f3
Update .travis.yml
ctalau May 6, 2016
dacdeb2
Update .travis.yml
ctalau May 6, 2016
89743dd
Update README.md
ctalau May 6, 2016
09a95fa
Copied the deploy and publish scripts locally
ctalau May 11, 2016
0250869
Copied the deploy and publish scripts locally
ctalau May 11, 2016
e2c1bfe
Added the edit link plugin
ctalau May 11, 2016
263568e
Update publish.sh
ctalau May 12, 2016
c683388
Sending the required params to the editlink plugin.
ctalau May 12, 2016
e7f61e0
I made some change
ctalau-oxygen May 12, 2016
b9ed3a4
Merge pull request #1 from ctalau-oxygen/WA-patch-master-1463075558475
ctalau May 12, 2016
85a5833
sdfdsf
raducoravu May 13, 2016
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
language: something
install:
- echo "Installed"
script:
- sh .travis/publish.sh
after_success:
- sh .travis/deploy.sh
env:
global:
- DITAMAP=DITA/UserManual.ditamap
- DITAVAL=DITA/author.ditaval
- ANT_OPTS=-Xmx1024M
- secure: eDx05nCQBkMghcyW2gDBwpOEkb3mg2wYd+B3qdyfLidkHXWxluECt1pau9E0m4c7vVzaY5nH5GRm9aePkLhxTbqVcAaLd84JBkszxyBIGMK95r5LxQC8vjnc+UKDL7t9sPVeXavmyLarOuRWD0ZPTF7GsEdmap/HYO5fUEhUKjiae5xp//JV3bOrvKBqXkk0XdCpUwJWyGqp5X/Nx8BtAYWW3aJs6xRT5PQueHPH3QYUlsV/BstKHFkgNmCL/Kc47JTAUgd46fxH4FerKpDq44hK9sOMqlvLFshmbmRqfaaLynpwfM6QtS9jp3ZZQ9bt8oXucM5NYNdK6VXG7gEQkKP0EW2/NfODzB/E6E10B2jY6C6KqoJ2xfsdgT1DQnrlTUz3eOCTfdY873AWNuWfHv9UlP5QIrCYWqVktJCkJWDdlG2VhWCieUkUx5C2nh50ZkGALRBP8gs8ztQ5hwifdbuqBd3lVYYi6ZPl0JIUDRK68O2rX1sr4+9P0HCLuSOTSnN9H1QMvM8X2aBZxtuk0rhcQLqPvY5EV8kj3R2tfemq3jIDDBZD0EMuQVR8Ilza2AZPJhtCwMzrd6+JrVk5UWfNtTN2dUhUNBwt8Zr/GmnKhbg0H0ZWhXtd+zDfwCpAazGllncwadfF2DP2hVSyBy4vN5ijL3lxTFxN/IiJYg8=
before_install:
- openssl aes-256-cbc -K $encrypted_44bb9a165316_key -iv $encrypted_44bb9a165316_iv
-in licenseKey.txt.enc -out licenseKey.txt -d
33 changes: 33 additions & 0 deletions .travis/deploy.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
#!/bin/bash

set -o errexit -o nounset

if [ "$TRAVIS_BRANCH" != "master" ]
then
echo "This commit was made against the $TRAVIS_BRANCH and not the master! No deploy!"
exit 0
fi

rev=$(git rev-parse --short HEAD)

REPONAME=`basename $PWD`
PARENTDIR=`dirname $PWD`
USERNAME=`basename $PARENTDIR`
cd out

git init
git config user.name "oXygen XML Deployer"
git config user.email "[email protected]"

git remote add upstream "https://$GH_TOKEN@github.com/$USERNAME/$REPONAME.git"
git fetch upstream
git reset upstream/gh-pages

touch .

ls
git status

git add -A .
git commit -m "rebuild pages at ${rev}"
git push -q upstream HEAD:gh-pages
30 changes: 30 additions & 0 deletions .travis/publish.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
wget http://mirror.oxygenxml.com/InstData/Editor/Webhelp/oxygen-webhelp.zip
unzip oxygen-webhelp.zip

wget https://github.com/dita-ot/dita-ot/releases/download/2.2.3/dita-ot-2.2.3.zip
unzip dita-ot-2.2.3.zip

cp -R com.oxygenxml.* dita-ot-2.2.3/plugins/
mv dita-ot-2.2.3/plugins/com.oxygenxml.webhelp/plugin_2.x.xml dita-ot-2.2.3/plugins/com.oxygenxml.webhelp/plugin.xml
# Add the editlink plugin
git clone https://github.com/ctalau/ditaot-editlink-plugin dita-ot-2.2.3/plugins/com.oxygenxml.editlink/

cd dita-ot-2.2.3/
bin/ant -f integrator.xml
cd ..

cp licenseKey.txt dita-ot-2.2.3/plugins/com.oxygenxml.webhelp/licensekey.txt

rm -rf out

REPONAME=`basename $PWD`
PARENTDIR=`dirname $PWD`
USERNAME=`basename $PARENTDIR`

# Send some parameters to the "editlink" plugin as system properties
export ANT_OPTS="$ANT_OPTS -Dditamap.path=$DITAMAP"
export ANT_OPTS="$ANT_OPTS -Dcwd=`pwd`"
export ANT_OPTS="$ANT_OPTS -Drepo.url=github://getFileContent/$USERNAME/$REPONAME/$TRAVIS_BRANCH/"
export ANT_OPTS="$ANT_OPTS -Dwebapp.url=https://www.oxygenxml.com/webapp-demo-aws/"

dita-ot-2.2.3/bin/dita -i $DITAMAP -f webhelp-responsive -filter=$DITAVAL
2 changes: 1 addition & 1 deletion DITA/concepts/installation-options.dita
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<title>Installation Options for <ph keyref="product"/></title>
<conbody>
<section product="author developer editor svnClient">
<title>Choosing how <ph keyref="product"/> runs</title>
<title>Choosing how <ph keyref="product"/> works</title>
<p>You can install <ph keyref="product"/> to run in a number of ways:</p>
<ul>
<li>
Expand Down
4 changes: 2 additions & 2 deletions DITA/keydefs.ditamap
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@
<keydef keys="majorVersion" product="webapp">
<topicmeta>
<keywords>
<keyword>555</keyword>
<keyword>17.1.1</keyword>
</keywords>
</topicmeta>
</keydef>
Expand All @@ -211,7 +211,7 @@
<keydef keys="minorVersion" product="webapp">
<topicmeta>
<keywords>
<keyword>555.0</keyword>
<keyword>17.1.1</keyword>
</keywords>
</topicmeta>
</keydef>
Expand Down
7 changes: 3 additions & 4 deletions DITA/topics/author-dita-doc-type.dita
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
authoring, producing, and delivering technical information. It divides content into small,
self-contained topics that you can reuse in various deliverables. The extensibility of DITA
permits organizations to define specific information structures while still using standard
tools to work with them. <ph keyref="product"/> provides schema-driven (DTD, RNG, XSD)
templates for DITA documents.</p>
tools to work with them. Oxygen XML Author provides schema-driven (DTD, RNG, XSD) templates
for DITA documents.</p>
<p><indexterm>DITA Topics document type<indexterm>association rules</indexterm></indexterm>A
file is considered to be a DITA topic document when one of the following conditions are
true:</p>
Expand All @@ -26,8 +26,7 @@
<li>The root element of the file has an attribute named <codeph>DITAArchVersion</codeph> for
the <q>http://dita.oasis-open.org/architecture/2005/</q> namespace. This enhanced case of
matching is only applied when the <uicontrol>Enable DTD/XML Schema processing in document
type detection</uicontrol> option is enabled from the <ph
conkeyref="reusables-preferences-pages/preferences-document-type-association"/>.</li>
type detection</uicontrol> option is enabled from the Preferences Menu.</li>
</ul>
<p><indexterm>DITA Topics document type<indexterm>schema</indexterm></indexterm>Default schemas
that are used if one is not detected in the DITA documents are stored in the various folders
Expand Down
2 changes: 1 addition & 1 deletion DITA/topics/introduction.dita
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<!DOCTYPE topic
PUBLIC "-//OASIS//DTD DITA Topic//EN" "http://docs.oasis-open.org/dita/v1.1/OS/dtd/topic.dtd">
<topic id="introduction">
<title>Introduction</title>
<title>Introductions</title>
<body>
<p>Welcome to the User Manual of <ph keyref="product"/>
<ph keyref="minorVersion"/>.</p>
Expand Down
9 changes: 9 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# userguide

How to build it on travis:

1. Create manually the gh-pages branch.
1. Copy the travis file to the project.
1. Create a personal access token, encrypt it with travis and add it to the config file.
1. Encrypt the license key file with travis and add it in the root directory of the project as licenseKey.txt.
1. Set the ditamap and the ditaval files as env variables.
3 changes: 3 additions & 0 deletions licenseKey.txt.enc
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
�&?C4����=�f��(���[�HQ̺r�2HW@;+�[;:Ùj|UD�k{��3��\��-،�� �1d�_�f`.���d���r�%Q��@���dr�= p�i�z*���Ls^�"� @��`��5Md��5zoRB/F��疞IO�d \��,#pR��̍Ȗ�ɀ]ߜ��?azZK0�:L�L��0�]�Nh���Ļ���6m�
}.(�p�[\;�\��˪x��
.�w5$�z� ���7.4�L�W>S`��G���AUh=;�M�]W��Y?�<��C7�*g[���0��: �\�ٿ>.p��V:���G�ђ`J3s�/vHY�-
Expand Down