[dia] Remove SISSI from build, too.
- From: Hans Breuer <hans src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [dia] Remove SISSI from build, too.
- Date: Sat, 21 Jul 2012 16:00:21 +0000 (UTC)
commit 5ce4b9625106c9730e3652e7747cc6ad5d5a4865
Author: Hans Breuer <hans breuer org>
Date: Sat Jul 21 16:45:37 2012 +0200
Remove SISSI from build, too.
It was removed from install before release 2009.
Now it is completely removed to not hinder maintenance.
configure.in | 2 -
lib/diasvgrenderer.c | 3 +
objects/Makefile.am | 2 +-
objects/SISSI/Makefile.am | 39 -
objects/SISSI/area.c | 295 ------
objects/SISSI/area.h | 43 -
objects/SISSI/classification.h | 56 --
objects/SISSI/faraday.c | 296 ------
objects/SISSI/faraday.h | 41 -
objects/SISSI/menace.c | 109 ---
objects/SISSI/menace.h | 49 -
objects/SISSI/methode_attack.h | 17 -
objects/SISSI/pixmaps/broken.xpm | 88 --
objects/SISSI/pixmaps/faraday.png | Bin 165 -> 0 bytes
objects/SISSI/pixmaps/sissi_object.xpm | 36 -
objects/SISSI/room.c | 293 ------
objects/SISSI/room.h | 43 -
objects/SISSI/sissi.c | 953 ------------------
objects/SISSI/sissi.h | 217 -----
objects/SISSI/sissi_dialog.c | 1175 -----------------------
objects/SISSI/sissi_dialog.h | 63 --
objects/SISSI/sissi_object.c | 335 -------
objects/SISSI/sissi_object.h | 44 -
objects/SISSI/site.c | 297 ------
objects/SISSI/site.h | 43 -
objects/makefile.msc | 16 +-
po/POTFILES.in | 10 -
sheets/Makefile.am | 5 +-
sheets/SISSI.sheet.in | 254 -----
sheets/SISSI/1.xml | 711 --------------
sheets/SISSI/10.xml | 711 --------------
sheets/SISSI/11.xml | 776 ---------------
sheets/SISSI/12.xml | 767 ---------------
sheets/SISSI/13.xml | 767 ---------------
sheets/SISSI/14.xml | 712 --------------
sheets/SISSI/15.xml | 712 --------------
sheets/SISSI/16.xml | 276 ------
sheets/SISSI/17.xml | 667 -------------
sheets/SISSI/18.xml | 667 -------------
sheets/SISSI/19.xml | 349 -------
sheets/SISSI/2.xml | 651 -------------
sheets/SISSI/20.xml | 457 ---------
sheets/SISSI/21.xml | 338 -------
sheets/SISSI/22.xml | 645 -------------
sheets/SISSI/23.xml | 645 -------------
sheets/SISSI/28.xml | 699 --------------
sheets/SISSI/29.xml | 750 ---------------
sheets/SISSI/3.xml | 666 -------------
sheets/SISSI/30.xml | 750 ---------------
sheets/SISSI/31.xml | 750 ---------------
sheets/SISSI/32.xml | 699 --------------
sheets/SISSI/33.xml | 750 ---------------
sheets/SISSI/34.xml | 750 ---------------
sheets/SISSI/35.xml | 750 ---------------
sheets/SISSI/36.xml | 767 ---------------
sheets/SISSI/37.xml | 801 ---------------
sheets/SISSI/38.xml | 750 ---------------
sheets/SISSI/39.xml | 750 ---------------
sheets/SISSI/4.xml | 696 --------------
sheets/SISSI/40.xml | 750 ---------------
sheets/SISSI/41.xml | 801 ---------------
sheets/SISSI/42.xml | 750 ---------------
sheets/SISSI/43.xml | 784 ---------------
sheets/SISSI/44.xml | 750 ---------------
sheets/SISSI/45.xml | 750 ---------------
sheets/SISSI/46.xml | 750 ---------------
sheets/SISSI/47.xml | 699 --------------
sheets/SISSI/48.xml | 722 --------------
sheets/SISSI/5.xml | 711 --------------
sheets/SISSI/50.xml | 699 --------------
sheets/SISSI/51.xml | 699 --------------
sheets/SISSI/52.xml | 699 --------------
sheets/SISSI/53.xml | 699 --------------
sheets/SISSI/54.xml | 739 --------------
sheets/SISSI/55.xml | 739 --------------
sheets/SISSI/56.xml | 699 --------------
sheets/SISSI/57.xml | 722 --------------
sheets/SISSI/58.xml | 722 --------------
sheets/SISSI/59.xml | 722 --------------
sheets/SISSI/6.xml | 711 --------------
sheets/SISSI/60.xml | 705 --------------
sheets/SISSI/61.xml | 699 --------------
sheets/SISSI/62.xml | 699 --------------
sheets/SISSI/63.xml | 756 ---------------
sheets/SISSI/7.xml | 767 ---------------
sheets/SISSI/70.xml | 734 --------------
sheets/SISSI/71.xml | 701 --------------
sheets/SISSI/75.xml | 745 --------------
sheets/SISSI/76.xml | 723 --------------
sheets/SISSI/8.xml | 767 ---------------
sheets/SISSI/9.xml | 711 --------------
sheets/SISSI/Makefile.am | 134 ---
sheets/SISSI/aircooler.png | Bin 441 -> 0 bytes
sheets/SISSI/aircooler_icon.png | Bin 296 -> 0 bytes
sheets/SISSI/alarm_center.png | Bin 375 -> 0 bytes
sheets/SISSI/analyse.png | Bin 946 -> 0 bytes
sheets/SISSI/barriere.png | Bin 339 -> 0 bytes
sheets/SISSI/barriere_icon.png | Bin 321 -> 0 bytes
sheets/SISSI/camera_interphone.png | Bin 1130 -> 0 bytes
sheets/SISSI/camera_interphone_icon.png | Bin 869 -> 0 bytes
sheets/SISSI/capteur_brise_glace.png | Bin 1040 -> 0 bytes
sheets/SISSI/capteur_brise_glace_icon.png | Bin 948 -> 0 bytes
sheets/SISSI/capteur_faisceau.png | Bin 859 -> 0 bytes
sheets/SISSI/capteur_faisceau_icon.png | Bin 757 -> 0 bytes
sheets/SISSI/cellular_phone.png | Bin 819 -> 0 bytes
sheets/SISSI/cloud.png | Bin 494 -> 0 bytes
sheets/SISSI/condensateur.png | Bin 391 -> 0 bytes
sheets/SISSI/condensateur_icon.png | Bin 432 -> 0 bytes
sheets/SISSI/detecteur_alimentation.png | Bin 1417 -> 0 bytes
sheets/SISSI/detecteur_alimentation_icon.png | Bin 704 -> 0 bytes
sheets/SISSI/detecteur_courant.png | Bin 1500 -> 0 bytes
sheets/SISSI/detecteur_courant_icon.png | Bin 643 -> 0 bytes
sheets/SISSI/detecteur_enthalpie.png | Bin 931 -> 0 bytes
sheets/SISSI/detecteur_enthalpie_icon.png | Bin 825 -> 0 bytes
sheets/SISSI/detecteur_fumee.png | Bin 959 -> 0 bytes
sheets/SISSI/detecteur_fumee_icon.png | Bin 721 -> 0 bytes
sheets/SISSI/detecteur_humidite.png | Bin 1081 -> 0 bytes
sheets/SISSI/detecteur_humidite_icon.png | Bin 745 -> 0 bytes
sheets/SISSI/detecteur_lumiere.png | Bin 1668 -> 0 bytes
sheets/SISSI/detecteur_lumiere_icon.png | Bin 1027 -> 0 bytes
sheets/SISSI/detecteur_mouvement.png | Bin 1194 -> 0 bytes
sheets/SISSI/detecteur_mouvement_icon.png | Bin 844 -> 0 bytes
sheets/SISSI/detecteur_mouvement_video.png | Bin 783 -> 0 bytes
sheets/SISSI/detecteur_mouvement_video_icon.png | Bin 643 -> 0 bytes
sheets/SISSI/detecteur_niveau.png | Bin 667 -> 0 bytes
sheets/SISSI/detecteur_pression.png | Bin 1329 -> 0 bytes
sheets/SISSI/detecteur_pression_icon.png | Bin 833 -> 0 bytes
sheets/SISSI/detecteur_qualite_air.png | Bin 299 -> 0 bytes
sheets/SISSI/detecteur_qualite_air_icon.png | Bin 751 -> 0 bytes
sheets/SISSI/detecteur_tension.png | Bin 1300 -> 0 bytes
sheets/SISSI/detecteur_tension_icon.png | Bin 789 -> 0 bytes
sheets/SISSI/detecteur_vehicule.png | Bin 450 -> 0 bytes
sheets/SISSI/detecteur_vehicule_icon.png | Bin 400 -> 0 bytes
sheets/SISSI/detecteur_vibration.png | Bin 1761 -> 0 bytes
sheets/SISSI/detecteur_vibration_icon.png | Bin 1349 -> 0 bytes
sheets/SISSI/digi_code.png | Bin 666 -> 0 bytes
sheets/SISSI/digi_code_icon.png | Bin 643 -> 0 bytes
sheets/SISSI/diskette.png | Bin 474 -> 0 bytes
sheets/SISSI/extincteur.png | Bin 2416 -> 0 bytes
sheets/SISSI/extincteur_icon.png | Bin 957 -> 0 bytes
sheets/SISSI/extracteur_humidite.png | Bin 1589 -> 0 bytes
sheets/SISSI/extracteur_humidite_icon.png | Bin 932 -> 0 bytes
sheets/SISSI/faraday.png | Bin 165 -> 0 bytes
sheets/SISSI/file.png | Bin 292 -> 0 bytes
sheets/SISSI/file_cabinet.png | Bin 730 -> 0 bytes
sheets/SISSI/filtre_air.png | Bin 1273 -> 0 bytes
sheets/SISSI/filtre_air_icon.png | Bin 940 -> 0 bytes
sheets/SISSI/hub.png | Bin 379 -> 0 bytes
sheets/SISSI/ibm_mini.png | Bin 438 -> 0 bytes
sheets/SISSI/info.png | Bin 735 -> 0 bytes
sheets/SISSI/information.png | Bin 3220 -> 0 bytes
sheets/SISSI/key.png | Bin 572 -> 0 bytes
sheets/SISSI/laptop.png | Bin 506 -> 0 bytes
sheets/SISSI/lecteur_badge.png | Bin 609 -> 0 bytes
sheets/SISSI/lecteur_badge_clavier.png | Bin 758 -> 0 bytes
sheets/SISSI/lecteur_badge_clavier_icon.png | Bin 637 -> 0 bytes
sheets/SISSI/lecteur_badge_icon.png | Bin 523 -> 0 bytes
sheets/SISSI/lecteur_biometrique.png | Bin 878 -> 0 bytes
sheets/SISSI/lecteur_biometrique_icon.png | Bin 773 -> 0 bytes
sheets/SISSI/logiciel.png | Bin 1096 -> 0 bytes
sheets/SISSI/meuble.png | Bin 897 -> 0 bytes
sheets/SISSI/modem.png | Bin 586 -> 0 bytes
sheets/SISSI/onduleur.png | Bin 828 -> 0 bytes
sheets/SISSI/onduleur_icon.png | Bin 702 -> 0 bytes
sheets/SISSI/ordinateur_portable.gif | Bin 321 -> 0 bytes
sheets/SISSI/pc.png | Bin 566 -> 0 bytes
sheets/SISSI/pda.png | Bin 354 -> 0 bytes
sheets/SISSI/pda_icon.png | Bin 782 -> 0 bytes
sheets/SISSI/personne.png | Bin 639 -> 0 bytes
sheets/SISSI/phone.png | Bin 835 -> 0 bytes
sheets/SISSI/pompe.png | Bin 1522 -> 0 bytes
sheets/SISSI/pompe_icon.png | Bin 1225 -> 0 bytes
sheets/SISSI/pompe_rotative.png | Bin 663 -> 0 bytes
sheets/SISSI/pompe_rotative_icon.png | Bin 614 -> 0 bytes
sheets/SISSI/porte_tambour.png | Bin 1378 -> 0 bytes
sheets/SISSI/porte_tambour_icon.png | Bin 1025 -> 0 bytes
sheets/SISSI/relational_database.png | Bin 272 -> 0 bytes
sheets/SISSI/router.png | Bin 627 -> 0 bytes
sheets/SISSI/safe.png | Bin 483 -> 0 bytes
sheets/SISSI/safe_icon.png | Bin 1143 -> 0 bytes
sheets/SISSI/sauvegarde.png | Bin 819 -> 0 bytes
sheets/SISSI/si.png | Bin 449 -> 0 bytes
sheets/SISSI/storage_array.png | Bin 652 -> 0 bytes
sheets/SISSI/tourniquet.png | Bin 1162 -> 0 bytes
sheets/SISSI/ventilateur.png | Bin 719 -> 0 bytes
sheets/SISSI/ventilateur_axial.png | Bin 861 -> 0 bytes
sheets/SISSI/ventilateur_axial_icon.png | Bin 447 -> 0 bytes
sheets/SISSI/ventilateur_centrifuge.png | Bin 1035 -> 0 bytes
sheets/SISSI/ventilateur_centrifuge_icon.png | Bin 909 -> 0 bytes
189 files changed, 7 insertions(+), 48454 deletions(-)
---
diff --git a/configure.in b/configure.in
index 0aff97d..aa5890f 100644
--- a/configure.in
+++ b/configure.in
@@ -626,7 +626,6 @@ objects/KAOS/Makefile
objects/Misc/Makefile
objects/network/Makefile
objects/SADT/Makefile
-objects/SISSI/Makefile
objects/standard/Makefile
objects/UML/Makefile
objects/Database/Makefile
@@ -663,7 +662,6 @@ sheets/GRAFCET/Makefile
sheets/Istar/Makefile
sheets/Jackson/Makefile
sheets/KAOS/Makefile
-sheets/SISSI/Makefile
sheets/UML/Makefile
plug-ins/Makefile
plug-ins/cgm/Makefile
diff --git a/lib/diasvgrenderer.c b/lib/diasvgrenderer.c
index 3d13d53..dc0d453 100644
--- a/lib/diasvgrenderer.c
+++ b/lib/diasvgrenderer.c
@@ -705,6 +705,9 @@ draw_text_line(DiaRenderer *self, TextLine *text_line,
case ALIGN_RIGHT:
tmp = g_strconcat(style, "; text-anchor:end", NULL);
break;
+ default:
+ tmp = g_strdup("");
+ break;
}
g_free (style);
style = tmp;
diff --git a/objects/Makefile.am b/objects/Makefile.am
index 042c18b..880b1fa 100644
--- a/objects/Makefile.am
+++ b/objects/Makefile.am
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
SUBDIRS = standard network UML ER FS flowchart custom custom_lines GRAFCET \
- chronogram SADT Misc Istar Jackson KAOS AADL SISSI Database
+ chronogram SADT Misc Istar Jackson KAOS AADL Database
EXTRA_DIST = \
makefile.msc objects.def
diff --git a/objects/makefile.msc b/objects/makefile.msc
index 7630b45..95b4eb3 100644
--- a/objects/makefile.msc
+++ b/objects/makefile.msc
@@ -1,7 +1,7 @@
!IFNDEF PACKAGE
PLUGINS = aadl chronogram custom er flowchart fs grafcet \
- Istar Jackson Kaos misc network sadt SISSI standard uml \
+ Istar Jackson Kaos misc network sadt standard uml \
Database custom_lines
#outdated: labels
@@ -279,20 +279,6 @@ tool-icons.h: $(ICON_PNGS)
!ENDIF
-!IFDEF OBJ_SISSI
-OBJECTS = \
- area.obj \
- faraday.obj \
- menace.obj \
- room.obj \
- sissi.obj \
- sissi_dialog.obj \
- sissi_object.obj \
- site.obj
-# this plug-in imports diagram_load_and_display () from dia.exe
-PKG_LINK = $(PKG_LINK) $(LIBXML2_LIBS) $(GTK2_LIBS) ..\..\app\dia-app.lib
-!ENDIF
-
!IFDEF OBJ_specware
OBJECTS = \
specware.obj \
diff --git a/po/POTFILES.in b/po/POTFILES.in
index b608f9b..43aa89d 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -138,15 +138,6 @@ objects/SADT/annotation.c
objects/SADT/arrow.c
objects/SADT/box.c
objects/SADT/sadt.c
-objects/SISSI/area.c
-objects/SISSI/classification.h
-objects/SISSI/faraday.c
-objects/SISSI/room.c
-objects/SISSI/sissi.c
-objects/SISSI/sissi_dialog.c
-objects/SISSI/sissi.h
-objects/SISSI/sissi_object.c
-objects/SISSI/site.c
objects/standard/arc.c
objects/standard/bezier.c
objects/standard/beziergon.c
@@ -274,6 +265,5 @@ sheets/network.sheet.in
sheets/Pneumatic.sheet.in
sheets/SADT.sheet.in
sheets/SDL.sheet.in
-sheets/SISSI.sheet.in
sheets/sybase.sheet.in
sheets/UML.sheet.in
diff --git a/sheets/Makefile.am b/sheets/Makefile.am
index 69bc4c4..37a7d45 100644
--- a/sheets/Makefile.am
+++ b/sheets/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = UML ER GRAFCET Jackson Istar KAOS SISSI
+SUBDIRS = UML ER GRAFCET Jackson Istar KAOS
# To create a .sheet.in file from a .sheet file, run
# sed 's!<description!<_description!;s!</description!</_description!;s!<name!<_name!;s!</name!</_name!;'
@@ -25,8 +25,7 @@ sheet_DATA = $(SHEETS)
-c $(top_srcdir)/po/.intltool-merge-cache
EXTRA_DIST = $(sheet_in_files) \
- checktrans checktrans.py \
- SISSI.sheet.in
+ checktrans checktrans.py
CLEANFILES = sheet-translation-report $(SHEETS)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
