Skip to content

Commit

Permalink
move the control files to a separate package/git repo
Browse files Browse the repository at this point in the history
  • Loading branch information
lslezak committed Dec 12, 2013
1 parent 7caa613 commit 9c83ecd
Show file tree
Hide file tree
Showing 17 changed files with 12 additions and 7,379 deletions.
9 changes: 0 additions & 9 deletions configure.in.in
Expand Up @@ -11,15 +11,6 @@
@YAST2-CHECKS-COMMON@
@YAST2-CHECKS-YCP@

## Nasty hack: xgettext doesn't work for XML files, so let's symlink it
( cd control;
for xml in `ls *.xml`; do
ln -sf $xml `basename $xml .xml`.glade
done
)
find control -name \*.glade | LC_ALL=C sort > POTFILES


AX_CHECK_DOCBOOK

# If we change the default here instead of in Makefile.am
Expand Down
1 change: 0 additions & 1 deletion control/.gitignore

This file was deleted.

44 changes: 4 additions & 40 deletions control/Makefile.am
@@ -1,44 +1,8 @@
# Makefile.am for installation/general
#

SUBDIRS = tests
client_DATA = \
inst_test_workflow.rb \
complete_workflow.rb

controldir = $(yast2dir)/control
EXTRA_DIST = $(client_DATA)

control_DATA = \
control.rnc \
control.rng

xml_files = \
control.SLED.xml \
control.SLES.xml \
control.SLES-for-VMware.xml \
control.openSUSE.xml \
add-on-template_installation.xml

# Note: The control.*.glade -> control.*.xml symlink is required to make xgettext
# auto-detect the type of this file (glade) so it will extract all
# <label>..</label> tags. The symlink is created in the toplevel
# configure.in.in file upon "autoconf" (via "make -f Makefile.cvs").
# Unfortunately, CVS doesn't support checking in symlinks - it would duplicate
# the file.

# Distribute also the generated control.rng file, the reason is that "trang"
# is a Java tool which adds huge dependency in OBS.
#
# The conversion happens during "make package" when building the tarball.
# The RNG file gets automatically updated after any change by the "control.rng"
# rule below.
#
# At build time the RNG file from tarball will have a newer time stamp
# and thus it will not need rebuild/update making "trang" unnecessary.
EXTRA_DIST = $(control_DATA) $(xml_files)

include $(top_srcdir)/Makefile.am.common

control.rng: control.rnc
trang -I rnc -O rng control.rnc control.rng

# checks only those control files that belong to this package
check-local: control.rng
xmllint --relaxng control.rng --noout $(xml_files)
30 changes: 0 additions & 30 deletions control/README

This file was deleted.

23 changes: 0 additions & 23 deletions control/add-on-template_installation.xml

This file was deleted.

File renamed without changes.

0 comments on commit 9c83ecd

Please sign in to comment.