diff --git a/.gitignore b/.gitignore index 086649eb4e63..6f0c3afec451 100644 --- a/.gitignore +++ b/.gitignore @@ -1,34 +1,24 @@ *.autosave *.mex* *.o +*.aux +*.log +*.bbl +*.blg +*.bk +*.tmp +*.d +*.toc +*.class +*.snm +*.nav *~ util/drake_config.mat -doc/derivations/rigidBodyDynamicsWConstraints.aux -doc/derivations/rigidBodyDynamicsWConstraints.log doc/derivations/elib.bib -doc/derivations/rigidBodyDynamicsWConstraints.bbl -doc/derivations/rigidBodyDynamicsWConstraints.blg -doc/derivations/rigidBodyDynamicsWConstraints.tex.bk -logfile.tmp -doc/analysis.aux doc/analysis.tex -doc/autogen-matlab/modeling_fig001.m -doc/autogen-matlab/modeling_fig001.pdf -doc/autogen-matlab/modeling_fig002.m -doc/autogen-matlab/modeling_fig002.pdf -doc/developers.aux -doc/drake.aux -doc/drake.bbl -doc/drake.blg -doc/drake.d -doc/drake.log -doc/drake.toc -doc/feedback.aux +doc/autogen-matlab doc/feedback.tex -doc/intro.aux -doc/modeling.aux doc/modeling.tex -doc/planning.aux doc/planning.tex fort.0 drake.a @@ -43,11 +33,6 @@ include/lcmt_pendulum_u.h include/lcmt_pendulum_x.h include/lcmt_pendulum_y.h include/lcmt_scope_data.h -util/MessageMonitor.class -util/MyLCMTypeDatabase$MyClassVisitor.class -LCMCoder.class -*.svn-base -.svn *.aux .drake_unit_test_mutex.mat .unitTestData.mat @@ -55,7 +40,6 @@ debug.txt stepping.mat walking.mat doc/DoxygenMatlab/html -externals/spotless .viewer-prefs include/lcmt_drake_signal.h include/lcmt_huboplus_input.h @@ -65,15 +49,9 @@ include/lcmt_robot_state.h include/lcmt_viewer_command.h .matlabroot *.dSYM -drake_viewer data_t.java -examples/ZMP/zmp-riccati.log -examples/ZMP/zmp-riccati.nav -zmp-riccati.snm -zmp-riccati.toc gurobi.pc eigen3.pc -.matlabcpu util/debugMex util/test/debugMexTest_mexdebug.mat *_mexdebug.mat @@ -89,11 +67,9 @@ lcmtypes/cpp lcmtypes/java lcmtypes/python build -unitTest.log mlint_output.html doc/DoxygenMatlab/latex doc/urdf -doc/ik.log doc/ik.pdf doc/rigidbody.tex solvers/test/failed_paths diff --git a/Makefile b/Makefile index cb3ef35d0be9..f1c1613f55b3 100644 --- a/Makefile +++ b/Makefile @@ -41,24 +41,19 @@ configure: @cd pod-build && cmake -DCMAKE_INSTALL_PREFIX=$(BUILD_PREFIX) \ -DCMAKE_BUILD_TYPE=$(BUILD_TYPE) .. - -.PHONY: doc pdfdoc htmldoc -doc: doxygen +.PHONY: doc doxygen +doc: doxygen doc/drake.pdf doc/urdf/drakeURDF.html doxygen : doxygen doc/Doxyfile -pdfdoc: +doc/drake.pdf : # apologies for hard-coding this for my mac for now... - Russ - # todo: fix then enable doxygen pdf output cd doc && make -f ~/code/latex/makefile_tex drake.pdf - cd doc && /Applications/oxygen/schemaDocumentationMac.sh drakeURDF.xsd -cfg:oxygen_export_settings_pdf.xml - cp doc/urdf/drakeURDF.pdf doc/drakeURDF.pdf -htmldoc: doxygen +doc/urdf/drakeURDF.html : doc/drakeURDF.xsd # apologies for hard-coding this for my mac for now... - Russ cd doc && /Applications/oxygen/schemaDocumentationMac.sh drakeURDF.xsd -cfg:oxygen_export_settings_html.xml -# cd doc && maketex html # need to fix this .PHONY: mlint mlint : diff --git a/doc/changesToSupportingTools.txt b/doc/changesToSupportingTools.txt index 0a40cc89fdf4..d03d225bd5ec 100644 --- a/doc/changesToSupportingTools.txt +++ b/doc/changesToSupportingTools.txt @@ -20,19 +20,3 @@ This can actually kill your runtime as sparse(DAt.q > 0.2) will almost always ev ****** - -To SPOT: - -In @mssprog/sedumi, change - -[x,y,info]=sedumi(A,B,optimize*C,K,pars); - -to - -[L,U]=lu(A); -A2=U; B2=L\B; - -[x,y,info]=sedumi(A2,B2,optimize*C,K,pars); - - -******* diff --git a/doc/drakeURDF.pdf b/doc/drakeURDF.pdf deleted file mode 100644 index 72ff04fe3f3d..000000000000 Binary files a/doc/drakeURDF.pdf and /dev/null differ diff --git a/doc/oxygen_export_settings_pdf.xml b/doc/oxygen_export_settings_pdf.xml deleted file mode 100644 index 8830899a8b77..000000000000 --- a/doc/oxygen_export_settings_pdf.xml +++ /dev/null @@ -1,139 +0,0 @@ - - - - - xsd.documentation.options - - - jpeg - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - false - - - false - - - false - - - false - - - false - - - true - - - false - - - false - - - false - - - false - - - true - - - false - - - false - - - true - - - false - - - false - - - false - - - true - - - false - - - en - - - true - - - urdf/${cfn}.pdf - - - 3 - - - false - - - 2 - - - - - - true - - - true - - - false - - - - - - - - \ No newline at end of file diff --git a/doc/wiki b/doc/wiki index 49d246277fad..6a99979c67f6 160000 --- a/doc/wiki +++ b/doc/wiki @@ -1 +1 @@ -Subproject commit 49d246277fad9ee516868f6c528210ae269bd1db +Subproject commit 6a99979c67f6f8bccf915d1626a450555b9f895b