suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make automake distcheck ready

Browse Source
This commit is contained in:
wmayer 2012-12-08 15:45:17 +01:00
parent 0d44f9252a
commit d838f44e3c
4 changed files with 26 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
autogen.sh
View File

@ -4,25 +4,30 @@
# Get version and revision number # Get version and revision number
MAJ=0 MAJ=0
MIN=12 MIN=13
REV=0 REV=0
if svn --xml info >/dev/null 2>&1; then #if svn --xml info >/dev/null 2>&1; then
REV=`svn --xml info | tr -d '\r\n' | sed -e 's/.*<commit.*revision="\([0-9]*\)".*<\/commit>.*/\1/'` # REV=`svn --xml info | tr -d '\r\n' | sed -e 's/.*<commit.*revision="\([0-9]*\)".*<\/commit>.*/\1/'`
elif svn --version --quiet >/dev/null 2>&1; then #elif svn --version --quiet >/dev/null 2>&1; then
REV=`svn info | grep "^Revision:" | cut -d" " -f2` # REV=`svn info | grep "^Revision:" | cut -d" " -f2`
fi #fi
# count all lines that don't match this string
REV=`git rev-list HEAD | grep -cv "*"`
# if revision.m4 does not exist, create it # if revision.m4 does not exist, create it
REV_FILE=revision.m4 REV_FILE=revision.m4
if [ -f $REV_FILE ]; then #if [ -f $REV_FILE ]; then
echo "$REV_FILE found" # echo "$REV_FILE found"
else #else
echo "m4_define([FREECAD_MAJOR], $MAJ)" > $REV_FILE # echo "m4_define([FREECAD_MAJOR], $MAJ)" > $REV_FILE
echo "m4_define([FREECAD_MINOR], $MIN)" >> $REV_FILE # echo "m4_define([FREECAD_MINOR], $MIN)" >> $REV_FILE
echo "m4_define([FREECAD_MICRO], $REV)" >> $REV_FILE # echo "m4_define([FREECAD_MICRO], $REV)" >> $REV_FILE
echo "$REV_FILE created" # echo "$REV_FILE created"
fi #fi
echo "m4_define([FREECAD_MAJOR], $MAJ)" > $REV_FILE
echo "m4_define([FREECAD_MINOR], $MIN)" >> $REV_FILE
echo "m4_define([FREECAD_MICRO], $REV)" >> $REV_FILE
# create m4 subdirectory which fails for some older versions of autotools # create m4 subdirectory which fails for some older versions of autotools
[ -d m4 ] || mkdir m4 [ -d m4 ] || mkdir m4

3
src/Mod/Part/Gui/Makefile.am
View File

@ -210,6 +210,7 @@ EXTRA_DIST = \
Resources/icons/Part_CreatePrimitives.png \ Resources/icons/Part_CreatePrimitives.png \
Resources/icons/Part_CreatePrimitives.svg \ Resources/icons/Part_CreatePrimitives.svg \
Resources/icons/Part_Fuse.svg \ Resources/icons/Part_Fuse.svg \
Resources/icons/Part_CrossSections.svg \
Resources/icons/Part_Section.svg \ Resources/icons/Part_Section.svg \
Resources/icons/Part_Extrude.svg \ Resources/icons/Part_Extrude.svg \
Resources/icons/Part_Fillet.svg \ Resources/icons/Part_Fillet.svg \
@ -218,11 +219,13 @@ EXTRA_DIST = \
Resources/icons/Part_Loft.svg \ Resources/icons/Part_Loft.svg \
Resources/icons/Part_Mirror.svg \ Resources/icons/Part_Mirror.svg \
Resources/icons/Part_MirrorPNG.png \ Resources/icons/Part_MirrorPNG.png \
Resources/icons/Part_Offset.svg \
Resources/icons/Part_RuledSurface.svg \ Resources/icons/Part_RuledSurface.svg \
Resources/icons/Part_Shapebuilder.png \ Resources/icons/Part_Shapebuilder.png \
Resources/icons/Part_Shapebuilder.svg \ Resources/icons/Part_Shapebuilder.svg \
Resources/icons/Part_ShapeInfo.svg \ Resources/icons/Part_ShapeInfo.svg \
Resources/icons/Part_Sweep.svg \ Resources/icons/Part_Sweep.svg \
Resources/icons/Part_Thickness.svg \
Resources/icons/Tree_Part.svg \ Resources/icons/Tree_Part.svg \
Resources/icons/preferences-part_design.svg \ Resources/icons/preferences-part_design.svg \
Resources/icons/PartFeature.svg \ Resources/icons/PartFeature.svg \

3
src/Mod/PartDesign/Gui/Makefile.am
View File

@ -41,6 +41,7 @@ libPartDesignGui_la_UI=\
TaskPadParameters.ui \ TaskPadParameters.ui \
TaskPocketParameters.ui \ TaskPocketParameters.ui \
TaskChamferParameters.ui \ TaskChamferParameters.ui \
TaskDraftParameters.ui \
TaskFilletParameters.ui \ TaskFilletParameters.ui \
TaskFilletParameters.ui \ TaskFilletParameters.ui \
TaskHoleParameters.ui \ TaskHoleParameters.ui \
@ -72,7 +73,7 @@ libPartDesignGui_la_SOURCES=\
TaskFilletParameters.cpp \ TaskFilletParameters.cpp \
TaskFilletParameters.h \ TaskFilletParameters.h \
TaskDraftParameters.cpp \ TaskDraftParameters.cpp \
TaskDraftParameters.h \ TaskDraftParameters.h \
TaskLinearPatternParameters.cpp \ TaskLinearPatternParameters.cpp \
TaskLinearPatternParameters.h \ TaskLinearPatternParameters.h \
TaskMirroredParameters.cpp \ TaskMirroredParameters.cpp \

2
src/Mod/Sketcher/Gui/Resources/Makefile.am
View File

@ -72,7 +72,9 @@ icons/Constraint_PointOnObject.svg \
icons/Sketcher_Trimming.svg \ icons/Sketcher_Trimming.svg \
icons/Sketcher_External.svg \ icons/Sketcher_External.svg \
icons/Sketcher_LeaveSketch.svg \ icons/Sketcher_LeaveSketch.svg \
icons/Sketcher_MapSketch.svg \
icons/Sketcher_NewSketch.svg \ icons/Sketcher_NewSketch.svg \
icons/Sketcher_ViewSketch.svg \
icons/Sketcher_Sketch.svg \ icons/Sketcher_Sketch.svg \
translations/Sketcher_af.qm \ translations/Sketcher_af.qm \
translations/Sketcher_af.ts \ translations/Sketcher_af.ts \